apexdevkit 1.23.7__tar.gz → 1.23.9__tar.gz

{apexdevkit-1.23.7 → apexdevkit-1.23.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: apexdevkit
-Version: 1.23.7
+Version: 1.23.9
 Summary: Apex Development Tools for python.
 Author: Apex Dev
 Author-email: dev@apex.ge

{apexdevkit-1.23.7 → apexdevkit-1.23.9}/apexdevkit/http/fake.py

@@ -45,7 +45,7 @@ class FakeHttp:
     headers: dict[str, str] = field(default_factory=dict)
     params: dict[str, str] = field(default_factory=dict)
     json: JsonDict = field(default_factory=JsonDict)
-    data: JsonDict = field(default_factory=JsonDict)
+    data: Any = field(default_factory=JsonDict)
 
     _request: InterceptedRequest = field(init=False)
 
@@ -67,7 +67,7 @@ class FakeHttp:
 
         return self
 
-    def with_data(self, value: JsonDict) -> Self:
+    def with_data(self, value: Any) -> Self:
         self.data = value
 
         return self

{apexdevkit-1.23.7 → apexdevkit-1.23.9}/apexdevkit/http/fluent.py

@@ -20,7 +20,7 @@ class Http(Protocol):  # pragma: no cover
     def with_json(self, value: JsonDict) -> Http:
         pass
 
-    def with_data(self, value: JsonDict) -> Http:
+    def with_data(self, value: Any) -> Http:
         pass
 
     def request(self, method: HttpMethod, endpoint: str = "") -> HttpResponse:
@@ -68,10 +68,10 @@ class FluentHttp:
     def with_json(self, value: JsonDict) -> FluentHttp:
         return FluentHttp(self.http.with_json(value))
 
-    def and_data(self, value: JsonDict) -> FluentHttp:
+    def and_data(self, value: Any) -> FluentHttp:
         return self.with_data(value)
 
-    def with_data(self, value: JsonDict) -> FluentHttp:
+    def with_data(self, value: Any) -> FluentHttp:
         return FluentHttp(self.http.with_data(value))
 
     def post(self) -> FluentHttpRequest:

{apexdevkit-1.23.7 → apexdevkit-1.23.9}/apexdevkit/http/httpx/client.py

@@ -38,7 +38,7 @@ class Httpx:
     def with_param(self, key: str, value: str) -> Httpx:
         return Httpx(self.client, self.config.with_param(key, value))
 
-    def with_data(self, value: JsonDict) -> Httpx:
+    def with_data(self, value: Any) -> Httpx:
         return Httpx(self.client, self.config.with_data(value))
 
     def with_json(self, value: JsonDict) -> Httpx:
@@ -120,7 +120,7 @@ class HttpxConfig(Mapping[str, Any]):
     headers: JsonDict = field(default_factory=JsonDict)
     params: JsonDict = field(default_factory=JsonDict)
     json: JsonDict | None = None
-    data: JsonDict | None = None
+    data: Any | None = None
 
     def with_endpoint(self, endpoint: str) -> HttpxConfig:
         return HttpxConfig(
@@ -149,7 +149,7 @@ class HttpxConfig(Mapping[str, Any]):
             data=self.data,
         )
 
-    def with_data(self, value: JsonDict) -> HttpxConfig:
+    def with_data(self, value: Any) -> HttpxConfig:
         return HttpxConfig(
             endpoint=self.endpoint,
             headers=self.headers,
@@ -173,9 +173,14 @@ class HttpxConfig(Mapping[str, Any]):
             "headers": dict(self.headers),
             "params": dict(self.params),
             "json": dict(self.json) if self.json is not None else None,
-            "data": dict(self.data) if self.data is not None else None,
+            "data": self._data() if self.data is not None else None,
         }
 
+    def _data(self) -> Any:
+        if isinstance(self.data, Mapping):
+            return dict(self.data)
+        return str(self.data)
+
     def __len__(self) -> int:
         return len(self.as_dict())
 

{apexdevkit-1.23.7 → apexdevkit-1.23.9}/apexdevkit/repository/sqlite.py

@@ -105,14 +105,25 @@ class SqliteTableBuilder(Generic[ItemT]):
     table_name: str | None = None
     formatter: Formatter[Mapping[str, Any], ItemT] | None = None
     fields: list[_SqlField] | None = None
+    custom_filters: list[str] | None = None
 
     def with_name(self, value: str) -> SqliteTableBuilder[ItemT]:
-        return SqliteTableBuilder[ItemT](value, self.formatter, self.fields)
+        return SqliteTableBuilder[ItemT](
+            value,
+            self.formatter,
+            self.fields,
+            self.custom_filters,
+        )
 
     def with_formatter(
         self, value: Formatter[Mapping[str, Any], ItemT]
     ) -> SqliteTableBuilder[ItemT]:
-        return SqliteTableBuilder[ItemT](self.table_name, value, self.fields)
+        return SqliteTableBuilder[ItemT](
+            self.table_name,
+            value,
+            self.fields,
+            self.custom_filters,
+        )
 
     def with_fields(self, value: Iterable[_SqlField]) -> SqliteTableBuilder[ItemT]:
         key_list = list(value)
@@ -135,16 +146,29 @@ class SqliteTableBuilder(Generic[ItemT]):
             self.table_name,
             self.formatter,
             key_list,
+            self.custom_filters,
+        )
+
+    def with_custom_filters(self, filters: Iterable[str]) -> SqliteTableBuilder[ItemT]:
+        return SqliteTableBuilder[ItemT](
+            self.table_name,
+            self.formatter,
+            self.fields,
+            list(filters),
         )
 
     def build(self) -> SqlTable[ItemT]:
         if not self.table_name or not self.formatter or not self.fields:
             raise ValueError("Parameter missing.")
 
+        field_manager = SqlFieldManager.Builder().with_fields(self.fields)
+        if self.custom_filters and len(self.custom_filters) > 0:
+            field_manager = field_manager.with_custom_filters(self.custom_filters)
+
         return _DefaultSqlTable(
             self.table_name,
             self.formatter,
-            SqlFieldManager.Builder().with_fields(self.fields).for_sqlite().build(),
+            field_manager.for_sqlite().build(),
         )
 
 

{apexdevkit-1.23.7 → apexdevkit-1.23.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "apexdevkit"
-version = "1.23.7"
+version = "1.23.9"
 description = "Apex Development Tools for python."
 readme = "README.md"
 authors = [