apexdevkit 1.5.24__tar.gz → 1.5.25__tar.gz

{apexdevkit-1.5.24 → apexdevkit-1.5.25}/PKG-INFO

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

{apexdevkit-1.5.24 → apexdevkit-1.5.25}/apexdevkit/http/httpx.py

@@ -4,34 +4,37 @@ from dataclasses import dataclass, field
 from typing import Any, Iterator, Mapping, Self
 
 import httpx
+from httpx import Client
 
 from apexdevkit.http.fluent import HttpMethod, HttpResponse
 from apexdevkit.http.json import JsonDict
-from apexdevkit.http.url import HttpUrl
+
+
+def default_config() -> HttpxConfig:
+    return HttpxConfig()
 
 
 @dataclass(frozen=True)
 class Httpx:
-    url: HttpUrl
-    config: HttpxConfig
+    client: httpx.Client
+
+    config: HttpxConfig = field(default_factory=default_config)
 
     @classmethod
     def create_for(cls, url: str) -> Self:
-        return cls(HttpUrl(url), HttpxConfig())
+        return cls(Client(base_url=url), HttpxConfig())
 
     def with_header(self, key: str, value: str) -> Httpx:
-        return Httpx(self.url, self.config.with_header(key, value))
+        return Httpx(self.client, self.config.with_header(key, value))
 
     def with_param(self, key: str, value: str) -> Httpx:
-        return Httpx(self.url, self.config.with_param(key, value))
+        return Httpx(self.client, self.config.with_param(key, value))
 
     def with_json(self, value: JsonDict) -> Httpx:
-        return Httpx(self.url, self.config.with_json(value))
+        return Httpx(self.client, self.config.with_json(value))
 
     def request(self, method: HttpMethod, endpoint: str) -> HttpResponse:
-        return _HttpxResponse(
-            httpx.request(method.name, self.url + endpoint, **self.config)
-        )
+        return _HttpxResponse(self.client.request(method.name, endpoint, **self.config))
 
 
 @dataclass

{apexdevkit-1.5.24 → apexdevkit-1.5.25}/apexdevkit/testing/rest.py

@@ -5,67 +5,76 @@ from dataclasses import dataclass, field
 from functools import cached_property
 from typing import Any, Iterable, Self
 
-import httpx
 from fastapi.testclient import TestClient
 
-from apexdevkit.http import HttpUrl, JsonDict
+from apexdevkit.http import Http, HttpUrl, JsonDict
+from apexdevkit.http.fluent import HttpMethod, HttpResponse
+from apexdevkit.http.httpx import Httpx
 
 
 @dataclass
 class RestResource:
-    http: TestClient
+    http: TestClient | Http
     name: RestfulName
 
+    def __post_init__(self) -> None:
+        if isinstance(self.http, TestClient):
+            self.http = Httpx(self.http)
+
+    @property
+    def _http(self) -> Http:
+        assert not isinstance(self.http, TestClient)
+
+        return self.http
+
     def create_one(self) -> CreateOne:
-        return CreateOne(self.name, self.http)
+        return CreateOne(self.name, self._http)
 
     def create_many(self) -> CreateMany:
-        return CreateMany(self.name, self.http)
+        return CreateMany(self.name, self._http)
 
     def read_one(self) -> ReadOne:
-        return ReadOne(self.name, self.http)
+        return ReadOne(self.name, self._http)
 
     def read_all(self) -> ReadAll:
-        return ReadAll(self.name, self.http)
+        return ReadAll(self.name, self._http)
 
     def update_one(self) -> UpdateOne:
-        return UpdateOne(self.name, self.http)
+        return UpdateOne(self.name, self._http)
 
     def update_many(self) -> UpdateMany:
-        return UpdateMany(self.name, self.http)
+        return UpdateMany(self.name, self._http)
 
     def replace_one(self) -> ReplaceOne:
-        return ReplaceOne(self.name, self.http)
+        return ReplaceOne(self.name, self._http)
 
     def replace_many(self) -> ReplaceMany:
-        return ReplaceMany(self.name, self.http)
+        return ReplaceMany(self.name, self._http)
 
     def delete_one(self) -> DeleteOne:
-        return DeleteOne(self.name, self.http)
+        return DeleteOne(self.name, self._http)
 
 
 @dataclass
 class RestCollection(RestResource):
     def sub_resource(self, name: str) -> RestItem:
-        return RestItem(
-            TestClient(
-                self.http.app,
-                base_url=HttpUrl(str(self.http.base_url)) + self.name.plural,
-            ),
-            RestfulName(name),
-        )
+        assert isinstance(self.http, Httpx), "sub resource only works with Httpx"
+
+        client = self.http.client
+        client.base_url = client.base_url.join(self.name.plural)
+
+        return RestItem(self.http, RestfulName(name))
 
 
 @dataclass
 class RestItem(RestResource):
     def sub_resource(self, name: str) -> RestItem:
-        return RestItem(
-            TestClient(
-                self.http.app,
-                base_url=HttpUrl(str(self.http.base_url)) + self.name.singular,
-            ),
-            RestfulName(name),
-        )
+        assert isinstance(self.http, Httpx), "sub resource only works with Httpx"
+
+        client = self.http.client
+        client.base_url = client.base_url.join(self.name.plural)
+
+        return RestItem(self.http, RestfulName(name))
 
 
 @dataclass
@@ -103,11 +112,11 @@ def as_plural(singular: str) -> str:
 @dataclass
 class RestRequest:
     resource: RestfulName
-    http: TestClient
+    http: Http
 
     @abstractmethod
     @cached_property
-    def response(self) -> httpx.Response:  # pragma: no cover
+    def response(self) -> HttpResponse:  # pragma: no cover
         pass
 
     def unpack(self) -> JsonDict:
@@ -122,7 +131,7 @@ class RestRequest:
         return RestResponse(
             resource=self.resource,
             json=JsonDict(self.response.json()),
-            http_code=self.response.status_code,
+            http_code=self.response.code(),
         )
 
 
@@ -136,8 +145,11 @@ class CreateOne(RestRequest):
         return self
 
     @cached_property
-    def response(self) -> httpx.Response:
-        return self.http.post(self.resource + "", json=dict(self.data))
+    def response(self) -> HttpResponse:
+        return self.http.with_json(self.data).request(
+            method=HttpMethod.post,
+            endpoint=self.resource + "",
+        )
 
 
 @dataclass
@@ -145,8 +157,11 @@ class ReadOne(RestRequest):
     item_id: str = field(init=False)
 
     @cached_property
-    def response(self) -> httpx.Response:
-        return self.http.get(self.resource + str(self.item_id))
+    def response(self) -> HttpResponse:
+        return self.http.request(
+            method=HttpMethod.get,
+            endpoint=self.resource + str(self.item_id),
+        )
 
     def with_id(self, value: Any) -> Self:
         self.item_id = str(value)
@@ -159,8 +174,12 @@ class ReadAll(RestRequest):
     params: dict[str, Any] = field(init=False, default_factory=dict)
 
     @cached_property
-    def response(self) -> httpx.Response:
-        return self.http.get(self.resource + "", params=self.params)
+    def response(self) -> HttpResponse:
+        http = self.http
+        for param, value in self.params.items():
+            http = http.with_param(param, value)
+
+        return http.request(method=HttpMethod.get, endpoint=self.resource + "")
 
     def with_params(self, **kwargs: Any) -> Self:
         self.params = {**kwargs}
@@ -174,8 +193,11 @@ class UpdateOne(RestRequest):
     data: JsonDict = field(init=False)
 
     @cached_property
-    def response(self) -> httpx.Response:
-        return self.http.patch(self.resource + str(self.item_id), json=dict(self.data))
+    def response(self) -> HttpResponse:
+        return self.http.with_json(self.data).request(
+            method=HttpMethod.patch,
+            endpoint=self.resource + str(self.item_id),
+        )
 
     def with_id(self, value: Any) -> Self:
         self.item_id = str(value)
@@ -193,8 +215,11 @@ class ReplaceOne(RestRequest):
     data: JsonDict = field(init=False)
 
     @cached_property
-    def response(self) -> httpx.Response:
-        return self.http.put(self.resource + "", json=dict(self.data))
+    def response(self) -> HttpResponse:
+        return self.http.with_json(self.data).request(
+            method=HttpMethod.put,
+            endpoint=self.resource + "",
+        )
 
     def from_data(self, value: JsonDict) -> Self:
         self.data = value
@@ -207,10 +232,12 @@ class CreateMany(RestRequest):
     data: list[JsonDict] = field(default_factory=list)
 
     @cached_property
-    def response(self) -> httpx.Response:
-        return self.http.post(
-            self.resource + "batch",
-            json={self.resource.plural: [dict(data) for data in self.data]},
+    def response(self) -> HttpResponse:
+        json = JsonDict({self.resource.plural: [dict(data) for data in self.data]})
+
+        return self.http.with_json(json).request(
+            method=HttpMethod.post,
+            endpoint=self.resource + "batch",
         )
 
     def from_data(self, value: JsonDict) -> Self:
@@ -227,10 +254,12 @@ class UpdateMany(RestRequest):
     data: list[JsonDict] = field(default_factory=list)
 
     @cached_property
-    def response(self) -> httpx.Response:
-        return self.http.patch(
-            self.resource + "",
-            json={self.resource.plural: [dict(data) for data in self.data]},
+    def response(self) -> HttpResponse:
+        json = JsonDict({self.resource.plural: [dict(data) for data in self.data]})
+
+        return self.http.with_json(json).request(
+            method=HttpMethod.patch,
+            endpoint=self.resource + "",
         )
 
     def from_data(self, value: JsonDict) -> Self:
@@ -247,10 +276,12 @@ class ReplaceMany(RestRequest):
     data: list[JsonDict] = field(default_factory=list)
 
     @cached_property
-    def response(self) -> httpx.Response:
-        return self.http.put(
-            self.resource + "batch",
-            json={self.resource.plural: [dict(data) for data in self.data]},
+    def response(self) -> HttpResponse:
+        json = JsonDict({self.resource.plural: [dict(data) for data in self.data]})
+
+        return self.http.with_json(json).request(
+            method=HttpMethod.put,
+            endpoint=self.resource + "batch",
         )
 
     def from_data(self, value: JsonDict) -> Self:
@@ -267,8 +298,11 @@ class DeleteOne(RestRequest):
     item_id: str = field(init=False)
 
     @cached_property
-    def response(self) -> httpx.Response:
-        return self.http.delete(self.resource + str(self.item_id))
+    def response(self) -> HttpResponse:
+        return self.http.request(
+            method=HttpMethod.delete,
+            endpoint=self.resource + str(self.item_id),
+        )
 
     def with_id(self, value: Any) -> Self:
         self.item_id = str(value)

{apexdevkit-1.5.24 → apexdevkit-1.5.25}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "apexdevkit"
-version = "1.5.24"
+version = "1.5.25"
 description = "Apex Development Tools for python."
 authors = ["Apex Dev <dev@apex.ge>"]
 readme = "README.md"