Sync

.github/workflows/check-dependencies.yml

@@ -13,6 +13,7 @@ jobs:
       - name: 'Checkout Repository'
         uses: actions/checkout@v4
       - name: 'Dependency Review'
+        if: github.event.pull_request.head.repo.full_name == github.repository
         uses: actions/dependency-review-action@v4
         # Refer: https://github.com/actions/dependency-review-action
         with:

.github/workflows/hugegraph-python-client.yml

@@ -15,13 +15,16 @@ jobs:
       matrix:
         python-version: ["3.10", "3.11", "3.12"]
 
-    steps:
-      # TODO: upgrade to HugeGraph 1.5.0 (need to update the test cases)
-      - name: Prepare HugeGraph Server Environment
-        run: |
-          docker run -d --name=graph -p 8080:8080 -e PASSWORD=admin hugegraph/hugegraph:1.3.0
-          sleep 10
+    services:
+      hugegraph:
+        image: hugegraph/hugegraph:1.7.0
+        env:
+          PASSWORD: admin
+        options: --health-cmd="curl -f http://localhost:8080/versions || exit 1" --health-interval=10s --health-timeout=5s --health-retries=5
+        ports:
+          - 8080:8080
 
+    steps:
       - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}

hugegraph-python-client/src/pyhugegraph/api/auth.py

@@ -22,13 +22,19 @@
 from pyhugegraph.utils import huge_router as router
 
 
+# NOTE: Auth endpoints currently use absolute paths (/auth/...) which rely on a
+# temporary PathFilter compatibility layer in HugeGraph 1.7.0. This layer will be
+# removed in future versions. When it is removed, these paths should be converted
+# to relative paths (auth/...) with proper graphspace-scoped routing for non-group
+# endpoints, similar to the Java Client's dual-path strategy.
+# See: apache/hugegraph-ai#322 (HugeGraph 1.7.0 auth API migration)
 class AuthManager(HugeParamsBase):
-    @router.http("GET", "auth/users")
+    @router.http("GET", "/auth/users")
     def list_users(self, limit=None):
         params = {"limit": limit} if limit is not None else {}
         return self._invoke_request(params=params)
 
-    @router.http("POST", "auth/users")
+    @router.http("POST", "/auth/users")
     def create_user(self, user_name, user_password, user_phone=None, user_email=None) -> dict | None:
         return self._invoke_request(
             data=json.dumps(
@@ -41,14 +47,14 @@ def create_user(self, user_name, user_password, user_phone=None, user_email=None
             )
         )
 
-    @router.http("DELETE", "auth/users/{user_id}")
-    def delete_user(self, user_id) -> dict | None:  # pylint: disable=unused-argument
+    @router.http("DELETE", "/auth/users/{user_id}")
+    def delete_user(self, user_id) -> dict | None:
         return self._invoke_request()
 
-    @router.http("PUT", "auth/users/{user_id}")
+    @router.http("PUT", "/auth/users/{user_id}")
     def modify_user(
         self,
-        user_id,  # pylint: disable=unused-argument
+        user_id,
         user_name=None,
         user_password=None,
         user_phone=None,
@@ -65,39 +71,39 @@ def modify_user(
             )
         )
 
-    @router.http("GET", "auth/users/{user_id}")
-    def get_user(self, user_id) -> dict | None:  # pylint: disable=unused-argument
+    @router.http("GET", "/auth/users/{user_id}")
+    def get_user(self, user_id) -> dict | None:
         return self._invoke_request()
 
-    @router.http("GET", "auth/groups")
+    @router.http("GET", "/auth/groups")
     def list_groups(self, limit=None) -> dict | None:
         params = {"limit": limit} if limit is not None else {}
         return self._invoke_request(params=params)
 
-    @router.http("POST", "auth/groups")
+    @router.http("POST", "/auth/groups")
     def create_group(self, group_name, group_description=None) -> dict | None:
         data = {"group_name": group_name, "group_description": group_description}
         return self._invoke_request(data=json.dumps(data))
 
-    @router.http("DELETE", "auth/groups/{group_id}")
-    def delete_group(self, group_id) -> dict | None:  # pylint: disable=unused-argument
+    @router.http("DELETE", "/auth/groups/{group_id}")
+    def delete_group(self, group_id) -> dict | None:
         return self._invoke_request()
 
-    @router.http("PUT", "auth/groups/{group_id}")
+    @router.http("PUT", "/auth/groups/{group_id}")
     def modify_group(
         self,
-        group_id,  # pylint: disable=unused-argument
+        group_id,
         group_name=None,
         group_description=None,
     ) -> dict | None:
         data = {"group_name": group_name, "group_description": group_description}
         return self._invoke_request(data=json.dumps(data))
 
-    @router.http("GET", "auth/groups/{group_id}")
-    def get_group(self, group_id) -> dict | None:  # pylint: disable=unused-argument
+    @router.http("GET", "/auth/groups/{group_id}")
+    def get_group(self, group_id) -> dict | None:
         return self._invoke_request()
 
-    @router.http("POST", "auth/accesses")
+    @router.http("POST", "/auth/accesses")
     def grant_accesses(self, group_id, target_id, access_permission) -> dict | None:
         return self._invoke_request(
             data=json.dumps(
@@ -109,25 +115,24 @@ def grant_accesses(self, group_id, target_id, access_permission) -> dict | None:
             )
         )
 
-    @router.http("DELETE", "auth/accesses/{access_id}")
-    def revoke_accesses(self, access_id) -> dict | None:  # pylint: disable=unused-argument
+    @router.http("DELETE", "/auth/accesses/{access_id}")
+    def revoke_accesses(self, access_id) -> dict | None:
         return self._invoke_request()
 
-    @router.http("PUT", "auth/accesses/{access_id}")
-    def modify_accesses(self, access_id, access_description) -> dict | None:  # pylint: disable=unused-argument
-        # The permission of access can\'t be updated
+    @router.http("PUT", "/auth/accesses/{access_id}")
+    def modify_accesses(self, access_id, access_description) -> dict | None:
         data = {"access_description": access_description}
         return self._invoke_request(data=json.dumps(data))
 
-    @router.http("GET", "auth/accesses/{access_id}")
-    def get_accesses(self, access_id) -> dict | None:  # pylint: disable=unused-argument
+    @router.http("GET", "/auth/accesses/{access_id}")
+    def get_accesses(self, access_id) -> dict | None:
         return self._invoke_request()
 
-    @router.http("GET", "auth/accesses")
+    @router.http("GET", "/auth/accesses")
     def list_accesses(self) -> dict | None:
         return self._invoke_request()
 
-    @router.http("POST", "auth/targets")
+    @router.http("POST", "/auth/targets")
     def create_target(self, target_name, target_graph, target_url, target_resources) -> dict | None:
         return self._invoke_request(
             data=json.dumps(
@@ -140,14 +145,14 @@ def create_target(self, target_name, target_graph, target_url, target_resources)
             )
         )
 
-    @router.http("DELETE", "auth/targets/{target_id}")
-    def delete_target(self, target_id) -> None:  # pylint: disable=unused-argument
+    @router.http("DELETE", "/auth/targets/{target_id}")
+    def delete_target(self, target_id) -> None:
         return self._invoke_request()
 
-    @router.http("PUT", "auth/targets/{target_id}")
+    @router.http("PUT", "/auth/targets/{target_id}")
     def update_target(
         self,
-        target_id,  # pylint: disable=unused-argument
+        target_id,
         target_name,
         target_graph,
         target_url,
@@ -164,32 +169,32 @@ def update_target(
             )
         )
 
-    @router.http("GET", "auth/targets/{target_id}")
-    def get_target(self, target_id, response=None) -> dict | None:  # pylint: disable=unused-argument
+    @router.http("GET", "/auth/targets/{target_id}")
+    def get_target(self, target_id, response=None) -> dict | None:
         return self._invoke_request()
 
-    @router.http("GET", "auth/targets")
+    @router.http("GET", "/auth/targets")
     def list_targets(self) -> dict | None:
         return self._invoke_request()
 
-    @router.http("POST", "auth/belongs")
+    @router.http("POST", "/auth/belongs")
     def create_belong(self, user_id, group_id) -> dict | None:
         data = {"user": user_id, "group": group_id}
         return self._invoke_request(data=json.dumps(data))
 
-    @router.http("DELETE", "auth/belongs/{belong_id}")
-    def delete_belong(self, belong_id) -> None:  # pylint: disable=unused-argument
+    @router.http("DELETE", "/auth/belongs/{belong_id}")
+    def delete_belong(self, belong_id) -> None:
         return self._invoke_request()
 
-    @router.http("PUT", "auth/belongs/{belong_id}")
-    def update_belong(self, belong_id, description) -> dict | None:  # pylint: disable=unused-argument
+    @router.http("PUT", "/auth/belongs/{belong_id}")
+    def update_belong(self, belong_id, description) -> dict | None:
         data = {"belong_description": description}
         return self._invoke_request(data=json.dumps(data))
 
-    @router.http("GET", "auth/belongs/{belong_id}")
-    def get_belong(self, belong_id) -> dict | None:  # pylint: disable=unused-argument
+    @router.http("GET", "/auth/belongs/{belong_id}")
+    def get_belong(self, belong_id) -> dict | None:
         return self._invoke_request()
 
-    @router.http("GET", "auth/belongs")
+    @router.http("GET", "/auth/belongs")
     def list_belongs(self) -> dict | None:
         return self._invoke_request()

hugegraph-python-client/src/pyhugegraph/api/graphs.py

@@ -36,7 +36,13 @@ def get_graph_info(self) -> dict:
         return self._invoke_request(validator=ResponseValidation("text"))
 
     def clear_graph_all_data(self) -> dict:
-        if self._sess.cfg.gs_supported:
+        # Use PUT with an action body for HugeGraph 3.x+ (graph clear API)
+        # For HugeGraph 1.7.0 and other 1.x versions, the clear endpoint uses
+        # DELETE .../clear?confirm_message=... even when graphspace prefixes
+        # are enabled. Only use the PUT behavior when the server version is
+        # >= 3.0.0.
+        version_tuple = tuple(self._sess.cfg.version) if self._sess.cfg.version else (0, 0, 0)
+        if self._sess.cfg.gs_supported and version_tuple >= (3, 0, 0):
             response = self._sess.request(
                 "",
                 "PUT",

hugegraph-python-client/src/pyhugegraph/api/gremlin.py

@@ -28,12 +28,18 @@ class GremlinManager(HugeParamsBase):
     @router.http("POST", "/gremlin")
     def exec(self, gremlin):
         gremlin_data = GremlinData(gremlin)
+
+        # Version-specific gremlin request handling
         if self._sess.cfg.gs_supported:
+            # For graphspace-supported versions, use graphspace-scoped aliases.
+            # This includes HugeGraph 1.7.0+ when graphspace support is enabled.
             gremlin_data.aliases = {
                 "graph": f"{self._sess.cfg.graphspace}-{self._sess.cfg.graph_name}",
                 "g": f"__g_{self._sess.cfg.graphspace}-{self._sess.cfg.graph_name}",
             }
         else:
+            # For HugeGraph versions without graphspace support, always include aliases
+            # so `g` is bound.
             gremlin_data.aliases = {
                 "graph": f"{self._sess.cfg.graph_name}",
                 "g": f"__g_{self._sess.cfg.graph_name}",

hugegraph-python-client/src/pyhugegraph/api/schema_manage/edge_label.py

@@ -95,6 +95,16 @@ def enableLabelIndex(self, flag) -> "EdgeLabel":
         self._parameter_holder.set("enable_label_index", flag)
         return self
 
+    @decorator_params
+    def parent(self, parent_label) -> "EdgeLabel":
+        """
+        Set parent edge label for supporting parent & child edge label type (HugeGraph 1.7.0+).
+        When an edge label has a parent, it becomes a child edge label with inherited properties.
+        """
+        self._parameter_holder.set("parent_label", parent_label)
+        self._parameter_holder.set("edgelabel_type", "SUB")
+        return self
+
     @decorator_create
     def create(self):
         dic = self._parameter_holder.get_dic()
@@ -109,6 +119,8 @@ def create(self):
             "sort_keys",
             "user_data",
             "frequency",
+            "parent_label",  # Support parent & child edge label type (HugeGraph 1.7.0+)
+            "edgelabel_type",  # Required when parent_label is set (PARENT or SUB)
         ]
         for key in keys:
             if key in dic:

hugegraph-python-client/src/pyhugegraph/structure/gremlin_data.py

@@ -70,4 +70,11 @@ def to_json(self):
 
 class GremlinDataEncoder(json.JSONEncoder):
     def default(self, o):
-        return {k.split("__")[1]: v for k, v in vars(o).items()}
+        data = {}
+        for k, v in vars(o).items():
+            # Filter out None values only; keep empty collections as server may expect them
+            if v is None:
+                continue
+            key = k.split("__")[1]
+            data[key] = v
+        return data

hugegraph-python-client/src/pyhugegraph/utils/huge_config.py

@@ -53,15 +53,36 @@ def __post_init__(self):
                 )
 
                 match = re.search(r"(\d+)\.(\d+)(?:\.(\d+))?(?:\.\d+)?", core)
-                major, minor, patch = map(int, match.groups())
+                if match is None:
+                    raise RuntimeError(
+                        f"Unable to parse HugeGraph server version from response: {core!r}. "
+                        "Please verify the server is compatible with this client."
+                    )
+                major = int(match.group(1))
+                minor = int(match.group(2))
+                patch = int(match.group(3)) if match.group(3) else 0
                 self.version.extend([major, minor, patch])
 
-                if major >= 3:
+                # Version guard: Reject servers older than 1.5.0
+                if (major, minor, patch) < (1, 5, 0):
+                    raise RuntimeError(
+                        f"HugeGraph server version {major}.{minor}.{patch} is not supported. "
+                        "Please upgrade to HugeGraph >= 1.5.0 or use an older version of this client (v1.3.x)."
+                    )
+
+                # Enable graphspace support for versions > 1.5.0
+                # HugeGraph 1.7.0+ moved auth APIs to graphspaces/{graphspace}/auth/...
+                if (major, minor, patch) > (1, 5, 0):
                     self.graphspace = "DEFAULT"
                     self.gs_supported = True
                     log.warning("graph space is not set, default value 'DEFAULT' will be used.")
 
             except Exception as e:  # pylint: disable=broad-exception-caught
+                # Version mismatch errors must not be silently swallowed
+                if isinstance(e, RuntimeError):
+                    raise
+
+                # Handle network/parsing failures gracefully
                 try:
                     traceback.print_exception(e)
                     self.gs_supported = False

hugegraph-python-client/src/tests/api/test_auth.py

@@ -26,17 +26,29 @@
 class TestAuthManager(unittest.TestCase):
     client = None
     auth = None
+    skip_auth_tests = False
 
     @classmethod
     def setUpClass(cls):
         cls.client = ClientUtils()
         cls.auth = cls.client.auth
+        # Check if auth endpoints are available
+        try:
+            cls.auth.list_users()
+        except NotFoundError as e:
+            if "404" in str(e) or "Not Found" in str(e):
+                cls.skip_auth_tests = True
+            else:
+                raise
 
     @classmethod
     def tearDownClass(cls):
-        cls.client.clear_graph_all_data()
+        if not cls.skip_auth_tests:
+            cls.client.clear_graph_all_data()
 
     def setUp(self):
+        if self.skip_auth_tests:
+            self.skipTest("Auth endpoints not available in this server")
         users = self.auth.list_users()
         for user in users["users"]:
             if user["user_creator"] != "system":