python-arango-async 1.2.3__py3-none-any.whl → 1.2.5__py3-none-any.whl

arangoasync/collection.py

@@ -194,24 +194,49 @@ class Collection(Generic[T, U, V]):
 
         return doc_id
 
-    def _build_filter_conditions(self, filters: Optional[Json]) -> str:
+    @staticmethod
+    def _build_attribute_expression(field: str, prefix: str, bind_vars: Json) -> str:
+        """Build a bind-safe AQL document attribute expression."""
+        bind_vars[prefix] = field
+        field_access = f"doc[@{prefix}]"
+
+        if "." not in field:
+            return field_access
+
+        nested_access = "doc"
+        for field_index, field_part in enumerate(field.split(".")):
+            field_var = f"{prefix}_{field_index}"
+            bind_vars[field_var] = field_part
+            nested_access += f"[@{field_var}]"
+
+        return f"(HAS(doc, @{prefix}) ? {field_access} : {nested_access})"
+
+    def _build_filter_conditions(self, filters: Optional[Json]) -> tuple[str, Json]:
         """Build filter conditions for an AQL query.
 
         Args:
             filters (dict | None): Document filters.
 
         Returns:
-            str: The complete AQL filter condition.
+            tuple: The complete AQL filter condition and its bind variables.
         """
         if not filters:
-            return ""
+            return "", {}
 
         conditions = []
-        for k, v in filters.items():
-            field = k if "." in k else f"`{k}`"
-            conditions.append(f"doc.{field} == {self.serializer.dumps(v)}")
+        bind_vars: Json = {}
+        for filter_index, (field, value) in enumerate(filters.items()):
+            field_access = self._build_attribute_expression(
+                field,
+                f"filter_field_{filter_index}",
+                bind_vars,
+            )
 
-        return "FILTER " + " AND ".join(conditions)
+            value_var = f"filter_value_{filter_index}"
+            bind_vars[value_var] = value
+            conditions.append(f"{field_access} == @{value_var}")
+
+        return "FILTER " + " AND ".join(conditions), bind_vars
 
     @staticmethod
     def _is_none_or_int(obj: Any) -> bool:
@@ -259,24 +284,30 @@ class Collection(Generic[T, U, V]):
                 raise SortValidationError("'sort_order' must be either 'ASC' or 'DESC'")
 
     @staticmethod
-    def _build_sort_expression(sort: Optional[Jsons]) -> str:
+    def _build_sort_expression(sort: Optional[Jsons]) -> tuple[str, Json]:
         """Build a sort condition for an AQL query.
 
         Args:
             sort (list | None): Document sort parameters.
 
         Returns:
-            str: The complete AQL sort condition.
+            tuple: The complete AQL sort condition and its bind variables.
         """
         if not sort:
-            return ""
+            return "", {}
 
         sort_chunks = []
-        for sort_param in sort:
-            chunk = f"doc.{sort_param['sort_by']} {sort_param['sort_order']}"
+        bind_vars: Json = {}
+        for sort_index, sort_param in enumerate(sort):
+            field_access = Collection._build_attribute_expression(
+                sort_param["sort_by"],
+                f"sort_field_{sort_index}",
+                bind_vars,
+            )
+            chunk = f"{field_access} {sort_param['sort_order'].upper()}"
             sort_chunks.append(chunk)
 
-        return "SORT " + ", ".join(sort_chunks)
+        return "SORT " + ", ".join(sort_chunks), bind_vars
 
     @property
     def name(self) -> str:
@@ -1025,14 +1056,20 @@ class Collection(Generic[T, U, V]):
 
         skip = skip if skip is not None else 0
         limit = limit if limit is not None else "null"
+        filter_conditions, filter_bind_vars = self._build_filter_conditions(filters)
+        sort_expression, sort_bind_vars = self._build_sort_expression(sort)
         query = f"""
             FOR doc IN @@collection
-                {self._build_filter_conditions(filters)}
+                {filter_conditions}
                 LIMIT {skip}, {limit}
-                {self._build_sort_expression(sort)}
+                {sort_expression}
                 RETURN doc
         """
-        bind_vars = {"@collection": self.name}
+        bind_vars = {
+            "@collection": self.name,
+            **filter_bind_vars,
+            **sort_bind_vars,
+        }
         data: Json = {"query": query, "bindVars": bind_vars, "count": True}
         headers: RequestHeaders = {}
         if allow_dirty_read is not None:
@@ -1095,9 +1132,10 @@ class Collection(Generic[T, U, V]):
             raise ValueError("limit parameter must be a non-negative int")
 
         sync = f", waitForSync: {wait_for_sync}" if wait_for_sync is not None else ""
+        filter_conditions, filter_bind_vars = self._build_filter_conditions(filters)
         query = f"""
             FOR doc IN @@collection
-                {self._build_filter_conditions(filters)}
+                {filter_conditions}
                 {f"LIMIT {limit}" if limit is not None else ""}
                 UPDATE doc WITH @body IN @@collection
                 OPTIONS {{ keepNull: @keep_none, mergeObjects: @merge {sync} }}
@@ -1107,6 +1145,7 @@ class Collection(Generic[T, U, V]):
             "body": body,
             "keep_none": keep_none,
             "merge": merge_objects,
+            **filter_bind_vars,
         }
         data = {"query": query, "bindVars": bind_vars}
 
@@ -1151,9 +1190,10 @@ class Collection(Generic[T, U, V]):
             raise ValueError("limit parameter must be a non-negative int")
 
         sync = f"waitForSync: {wait_for_sync}" if wait_for_sync is not None else ""
+        filter_conditions, filter_bind_vars = self._build_filter_conditions(filters)
         query = f"""
             FOR doc IN @@collection
-                {self._build_filter_conditions(filters)}
+                {filter_conditions}
                 {f"LIMIT {limit}" if limit is not None else ""}
                 REPLACE doc WITH @body IN @@collection
                 {f"OPTIONS {{ {sync} }}" if sync else ""}
@@ -1161,6 +1201,7 @@ class Collection(Generic[T, U, V]):
         bind_vars = {
             "@collection": self.name,
             "body": body,
+            **filter_bind_vars,
         }
         data = {"query": query, "bindVars": bind_vars}
 
@@ -1203,14 +1244,15 @@ class Collection(Generic[T, U, V]):
             raise ValueError("limit parameter must be a non-negative int")
 
         sync = f"waitForSync: {wait_for_sync}" if wait_for_sync is not None else ""
+        filter_conditions, filter_bind_vars = self._build_filter_conditions(filters)
         query = f"""
             FOR doc IN @@collection
-                {self._build_filter_conditions(filters)}
+                {filter_conditions}
                 {f"LIMIT {limit}" if limit is not None else ""}
                 REMOVE doc IN @@collection
                 {f"OPTIONS {{ {sync} }}" if sync else ""}
         """  # noqa: E201 E202
-        bind_vars = {"@collection": self.name}
+        bind_vars = {"@collection": self.name, **filter_bind_vars}
         data = {"query": query, "bindVars": bind_vars}
 
         request = Request(

arangoasync/replication.py

@@ -2,6 +2,7 @@ __all__ = ["Replication"]
 
 
 from typing import Optional
+from warnings import warn
 
 from arangoasync.exceptions import (
     ReplicationApplierConfigError,
@@ -195,7 +196,9 @@ class Replication:
         return await self._executor.execute(request, response_handler)
 
     async def applier_config(self) -> Result[Json]:
-        """Return the configuration of the replication applier.
+        """**Removed** in ArangoDB v3.12.10.
+
+        Return the configuration of the replication applier.
 
         Returns:
             dict: Configuration of the replication applier.
@@ -206,6 +209,9 @@ class Replication:
         References:
            - `get-the-replication-applier-configuration <https://docs.arango.ai/arangodb/stable/develop/http-api/replication/replication-applier/#get-the-replication-applier-configuration>`__
         """  # noqa: E501
+        m = "/_api/replication/applier-config was removed in ArangoDB v3.12.10."
+        warn(m, DeprecationWarning, stacklevel=2)
+
         request = Request(
             method=Method.GET,
             endpoint="/_api/replication/applier-config",
@@ -220,7 +226,9 @@ class Replication:
         return await self._executor.execute(request, response_handler)
 
     async def applier_state(self) -> Result[Json]:
-        """Return the state of the replication applier.
+        """**Removed** in ArangoDB v3.12.10.
+
+        Return the state of the replication applier.
 
         Returns:
             dict: State of the replication applier.
@@ -231,6 +239,9 @@ class Replication:
         References:
             - `get-the-replication-applier-state <https://docs.arango.ai/arangodb/stable/develop/http-api/replication/replication-applier/#get-the-replication-applier-state>`__
         """  # noqa: E501
+        m = "/_api/replication/applier-state was removed in ArangoDB v3.12.10."
+        warn(m, DeprecationWarning, stacklevel=2)
+
         request = Request(
             method=Method.GET,
             endpoint="/_api/replication/applier-state",
@@ -245,7 +256,9 @@ class Replication:
         return await self._executor.execute(request, response_handler)
 
     async def server_id(self) -> Result[str]:
-        """Return the current server's ID.
+        """**Removed** in ArangoDB v3.12.10.
+
+        Return the current server's ID.
 
         Returns:
             str: Server ID.
@@ -256,6 +269,9 @@ class Replication:
         References:
             - `get-the-replication-server-id <https://docs.arango.ai/arangodb/stable/develop/http-api/replication/other-replication-commands/#get-the-replication-server-id>`__
         """  # noqa: E501
+        m = "/_api/replication/server-id was removed in ArangoDB v3.12.10."
+        warn(m, DeprecationWarning, stacklevel=2)
+
         request = Request(
             method=Method.GET,
             endpoint="/_api/replication/server-id",

arangoasync/typings.py

@@ -1060,6 +1060,10 @@ class IndexProperties(JsonWrapper):
     def legacy_polygons(self) -> Optional[bool]:
         return self._data.get("legacyPolygons")
 
+    @property
+    def figures(self) -> Optional[Json]:
+        return self._data.get("figures")
+
     @property
     def estimates(self) -> Optional[bool]:
         return self._data.get("estimates")
@@ -1140,6 +1144,10 @@ class IndexProperties(JsonWrapper):
     def training_state(self) -> Optional[str]:
         return self._data.get("trainingState")
 
+    @property
+    def shards(self) -> Optional[Json]:
+        return self._data.get("shards")
+
     @staticmethod
     def compatibility_formatter(data: Json) -> Json:
         """python-arango compatibility formatter."""
@@ -1170,6 +1178,8 @@ class IndexProperties(JsonWrapper):
             result["storedValues"] = data["storedValues"]
         if "legacyPolygons" in data:
             result["legacyPolygons"] = data["legacyPolygons"]
+        if "figures" in data:
+            result["figures"] = data["figures"]
         if "estimates" in data:
             result["estimates"] = data["estimates"]
         if "analyzer" in data:
@@ -1202,6 +1212,8 @@ class IndexProperties(JsonWrapper):
             result["error_message"] = data["errorMessage"]
         if "trainingState" in data:
             result["training_state"] = data["trainingState"]
+        if "shards" in data:
+            result["shards"] = data["shards"]
         return result
 
     def format(self, formatter: Optional[Formatter] = None) -> Json:

arangoasync/version.py

@@ -1 +1 @@
-__version__ = "1.2.3"
+__version__ = "1.2.5"

{python_arango_async-1.2.3.dist-info → python_arango_async-1.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-arango-async
-Version: 1.2.3
+Version: 1.2.5
 Summary: Async Python Driver for ArangoDB
 Author-email: Alexandru Petenchea <alexandru.petenchea@arangodb.com>, Anthony Mahanna <anthony.mahanna@arangodb.com>
 Maintainer-email: Alexandru Petenchea <alexandru.petenchea@arangodb.com>, Anthony Mahanna <anthony.mahanna@arangodb.com>
@@ -26,7 +26,7 @@ Requires-Dist: multidict>=6.0
 Requires-Dist: pyjwt>=2.10.0
 Provides-Extra: dev
 Requires-Dist: aiofiles>=24.1.0; extra == "dev"
-Requires-Dist: black==26.3.1; extra == "dev"
+Requires-Dist: black==26.5.1; extra == "dev"
 Requires-Dist: flake8==7.3.0; extra == "dev"
 Requires-Dist: isort>=5.10.1; extra == "dev"
 Requires-Dist: mypy==1.15.0; extra == "dev"

{python_arango_async-1.2.3.dist-info → python_arango_async-1.2.5.dist-info}/RECORD

@@ -4,7 +4,7 @@ arangoasync/auth.py,sha256=16apz1_IvAB_ZSyenoPha6F_JkbHokmOWFHxPL_swxQ,3025
 arangoasync/backup.py,sha256=6ZUDjP44bilv056K2fo8l7BnmoeksJ9G9keMVP7i9FI,10577
 arangoasync/client.py,sha256=MKLYXPdDhBezFIKX1H5e7-dKzYnIHwbfN0CO8AEsAzs,10054
 arangoasync/cluster.py,sha256=64GYlpz07wBczeNTrPpxnUd17tFocrhGijGHF_dqdoo,17260
-arangoasync/collection.py,sha256=BpyoYSgSIJ3PfPkqh6PwT7HLg66QLGkNA4eqx6xkYaM,122457
+arangoasync/collection.py,sha256=BXpFmCxqzB4qkCMMIJth4abq3ehHh62MEYovIzicFCY,124186
 arangoasync/compression.py,sha256=vMhcg5nQPkbgplk48vxARUnJ6YeIwrCLC6pDCVJSwo0,3804
 arangoasync/connection.py,sha256=f6HQOZHayluNVyH-j-sujlE_dvQrVxC1lPWnzrfQLqY,17459
 arangoasync/cursor.py,sha256=RQJOtNpxEx5n3eKx7UYPl1N8gzWYQESjufvakr18azk,8464
@@ -17,16 +17,16 @@ arangoasync/graph.py,sha256=G-todTf-ldTQtS2uhCsiigdPL4WABbbfTrLKlIPFkhA,40953
 arangoasync/http.py,sha256=xkxnLMbqFBEngmqGCuBOgRuXgQSBUk9-dzYXB1yrL98,6154
 arangoasync/job.py,sha256=B9cPDzxaYflWDj95j941wrcCj4w5j-gnmSzs3TdNdfw,7471
 arangoasync/logger.py,sha256=Ui4n-ELcYM4fujpZV6myU4by82L_70S1cfG0bhEhf-Q,58
-arangoasync/replication.py,sha256=gouhtixDa0zbPUTgY5vbh1MS2JHqRMeKtbL1GWbgjts,9497
+arangoasync/replication.py,sha256=nbccH3jg-aiJhi1OgrGObmleP2SJsRSg5IELm2Swddc,10042
 arangoasync/request.py,sha256=z9-MeoSh_6SP6we6VsaTICY7SFo6ZRjWuc1mbZcyN_E,3096
 arangoasync/resolver.py,sha256=icsmQIkklrvq-a88vIR8C-M3rcv5BJxhDE2PK8LenG0,3409
 arangoasync/response.py,sha256=VMnoWgtyrh1JGK7mEgRNsUtSawxWMgFjHT-Cff4d8zc,2132
 arangoasync/result.py,sha256=NVwFxpYUDujHNRCqCZIBOlGLzB7XsiSmjWPFhUgRS6k,233
 arangoasync/serialization.py,sha256=ExRqrEpbk11Hb3AfFUJGqPlGBD3dbvwQg_xsZUsrm6I,2910
-arangoasync/typings.py,sha256=xT6Dm63aTOWnLiiN0Gkxqm0jED4A43IyP_5p9haZKy4,70135
-arangoasync/version.py,sha256=C-D_WWrVkBDmQmApLcm0sWNh2CgIrwWfc8_sB5vvU-Q,22
-python_arango_async-1.2.3.dist-info/licenses/LICENSE,sha256=6zoGhJon2tcnvzmycirNjLNBZ6rlLJtYDdVGO76RXVM,1065
-python_arango_async-1.2.3.dist-info/METADATA,sha256=PBU14KUEYj8BqIOS5UjNIOu_ooOUJBrQaZMXjcJ46lo,7943
-python_arango_async-1.2.3.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-python_arango_async-1.2.3.dist-info/top_level.txt,sha256=uabwJ6t-MiIaZQXGUvYikeSbZDcF0RK37GzikBnDz5k,12
-python_arango_async-1.2.3.dist-info/RECORD,,
+arangoasync/typings.py,sha256=LmKV4_jNUoxZ6cI91l8H2XimhYl945ow_3FrcVEoB50,70480
+arangoasync/version.py,sha256=jBmZf3HLbiQlWiolOsAA6J5-BbxXD2bqFqEqDH3lfqo,22
+python_arango_async-1.2.5.dist-info/licenses/LICENSE,sha256=6zoGhJon2tcnvzmycirNjLNBZ6rlLJtYDdVGO76RXVM,1065
+python_arango_async-1.2.5.dist-info/METADATA,sha256=8dPPxISrFp18gU9zhZsuvdpW-OQreOptVKoJlrFZ62Y,7943
+python_arango_async-1.2.5.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+python_arango_async-1.2.5.dist-info/top_level.txt,sha256=uabwJ6t-MiIaZQXGUvYikeSbZDcF0RK37GzikBnDz5k,12
+python_arango_async-1.2.5.dist-info/RECORD,,

{python_arango_async-1.2.3.dist-info → python_arango_async-1.2.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (82.0.1)
+Generator: setuptools (84.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any