Skip to content

Commit a38d88a

Browse files
committed
Expose new community endpoints under v2
1 parent da60fab commit a38d88a

File tree

2 files changed

+30
-11
lines changed

2 files changed

+30
-11
lines changed

graphdatascience/session/session_v2_endpoints.py

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,16 @@
22

33
from graphdatascience.arrow_client.authenticated_flight_client import AuthenticatedArrowClient
44
from graphdatascience.arrow_client.v2.remote_write_back_client import RemoteWriteBackClient
5+
from graphdatascience.procedure_surface.api.community.clique_counting_endpoints import CliqueCountingEndpoints
6+
from graphdatascience.procedure_surface.api.community.kmeans_endpoints import KMeansEndpoints
7+
from graphdatascience.procedure_surface.api.community.labelpropagation_endpoints import LabelPropagationEndpoints
8+
from graphdatascience.procedure_surface.api.community.leiden_endpoints import LeidenEndpoints
59
from graphdatascience.procedure_surface.arrow.articlerank_arrow_endpoints import ArticleRankArrowEndpoints
610
from graphdatascience.procedure_surface.arrow.articulationpoints_arrow_endpoints import ArticulationPointsArrowEndpoints
711
from graphdatascience.procedure_surface.arrow.betweenness_arrow_endpoints import BetweennessArrowEndpoints
812
from graphdatascience.procedure_surface.arrow.catalog_arrow_endpoints import CatalogArrowEndpoints
913
from graphdatascience.procedure_surface.arrow.celf_arrow_endpoints import CelfArrowEndpoints
14+
from graphdatascience.procedure_surface.arrow.clique_counting_arrow_endpoints import CliqueCountingArrowEndpoints
1015
from graphdatascience.procedure_surface.arrow.closeness_arrow_endpoints import ClosenessArrowEndpoints
1116
from graphdatascience.procedure_surface.arrow.closeness_harmonic_arrow_endpoints import ClosenessHarmonicArrowEndpoints
1217
from graphdatascience.procedure_surface.arrow.degree_arrow_endpoints import DegreeArrowEndpoints
@@ -17,6 +22,9 @@
1722
from graphdatascience.procedure_surface.arrow.hashgnn_arrow_endpoints import HashGNNArrowEndpoints
1823
from graphdatascience.procedure_surface.arrow.k1coloring_arrow_endpoints import K1ColoringArrowEndpoints
1924
from graphdatascience.procedure_surface.arrow.kcore_arrow_endpoints import KCoreArrowEndpoints
25+
from graphdatascience.procedure_surface.arrow.kmeans_arrow_endpoints import KMeansArrowEndpoints
26+
from graphdatascience.procedure_surface.arrow.labelpropagation_arrow_endpoints import LabelPropagationArrowEndpoints
27+
from graphdatascience.procedure_surface.arrow.leiden_arrow_endpoints import LeidenArrowEndpoints
2028
from graphdatascience.procedure_surface.arrow.louvain_arrow_endpoints import LouvainArrowEndpoints
2129
from graphdatascience.procedure_surface.arrow.node2vec_arrow_endpoints import Node2VecArrowEndpoints
2230
from graphdatascience.procedure_surface.arrow.pagerank_arrow_endpoints import PageRankArrowEndpoints
@@ -61,6 +69,12 @@ def articulation_points(self) -> ArticulationPointsArrowEndpoints:
6169
def betweenness_centrality(self) -> BetweennessArrowEndpoints:
6270
return BetweennessArrowEndpoints(self._arrow_client, self._write_back_client, show_progress=self._show_progress)
6371

72+
@property
73+
def clique_counting(self) -> CliqueCountingEndpoints:
74+
return CliqueCountingArrowEndpoints(
75+
self._arrow_client, self._write_back_client, show_progress=self._show_progress
76+
)
77+
6478
@property
6579
def closeness_centrality(self) -> ClosenessArrowEndpoints:
6680
return ClosenessArrowEndpoints(self._arrow_client, self._write_back_client, show_progress=self._show_progress)
@@ -111,6 +125,19 @@ def k1_coloring(self) -> K1ColoringArrowEndpoints:
111125
def k_core_decomposition(self) -> KCoreArrowEndpoints:
112126
return KCoreArrowEndpoints(self._arrow_client, self._write_back_client, show_progress=self._show_progress)
113127

128+
@property
129+
def kmeans(self) -> KMeansEndpoints:
130+
return KMeansArrowEndpoints(self._arrow_client, self._write_back_client, show_progress=self._show_progress)
131+
132+
@property
133+
def label_propagation(self) -> LabelPropagationEndpoints:
134+
return LabelPropagationArrowEndpoints(
135+
self._arrow_client, self._write_back_client, show_progress=self._show_progress
136+
)
137+
138+
def leiden(self) -> LeidenEndpoints:
139+
return LeidenArrowEndpoints(self._arrow_client, self._write_back_client, show_progress=self._show_progress)
140+
114141
@property
115142
def louvain(self) -> LouvainArrowEndpoints:
116143
return LouvainArrowEndpoints(self._arrow_client, self._write_back_client, show_progress=self._show_progress)

graphdatascience/tests/integrationV2/procedure_surface/session/test_session_endpoint_coverage.py

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,16 @@
99
from graphdatascience.session.session_v2_endpoints import SessionV2Endpoints
1010

1111
MISSING_ALGO_ENDPOINTS = {
12-
"community.kmeans",
13-
"community.cliquecounting",
1412
"community.maxkcut",
15-
"community.cliquecounting.estimate",
16-
"community.labelPropagation.estimate",
1713
"community.maxkcut.estimate",
1814
"community.k1coloring",
1915
"community.triangleCount.estimate",
20-
"community.kmeans.estimate",
21-
"community.leiden",
16+
"community.sllpa",
2217
"community.sllpa.estimate",
2318
"community.modularityOptimization",
24-
"community.sllpa",
2519
"community.localClusteringCoefficient",
26-
"community.modularityOptimization.estimate",
27-
"community.labelPropagation",
2820
"community.localClusteringCoefficient.estimate",
29-
"community.leiden.estimate",
21+
"community.modularityOptimization.estimate",
3022
"community.triangleCount",
3123
"embeddings.graphSage.train.estimate", # TODO fix this by moving behind shared interface
3224
"embeddings.graphSage.estimate",
@@ -36,8 +28,8 @@
3628
"similarity.nodeSimilarity.filtered.estimate",
3729
"similarity.nodeSimilarity",
3830
"similarity.knn",
39-
"similarity.nodeSimilarity.estimate",
4031
"similarity.knn.estimate",
32+
"similarity.nodeSimilarity.estimate",
4133
"pathfinding.sourceTarget.dijkstra.estimate",
4234
"pathfinding.sourceTarget.aStar",
4335
"pathfinding.prizeSteinerTree.estimate",

0 commit comments

Comments
 (0)