apexdevkit 1.5.14__tar.gz → 1.5.16__tar.gz

{apexdevkit-1.5.14 → apexdevkit-1.5.16}/PKG-INFO

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

{apexdevkit-1.5.14 → apexdevkit-1.5.16}/apexdevkit/fastapi/builder.py

@@ -3,8 +3,6 @@ from typing import Any, Self
 
 from fastapi import APIRouter, FastAPI
 
-from apexdevkit.annotation import deprecated
-
 
 @dataclass
 class FastApiBuilder:
@@ -28,7 +26,6 @@ class FastApiBuilder:
 
         return self
 
-    @deprecated("Pass dependencies to router via with_infra method instead")
     def with_dependency(self, **values: Any) -> Self:  # pragma: no cover
         for key, value in values.items():
             setattr(self.app.state, key, value)

{apexdevkit-1.5.14 → apexdevkit-1.5.16}/apexdevkit/fastapi/router.py

@@ -6,9 +6,8 @@ from typing import Annotated, Any, Callable, Iterable, Self, TypeVar
 from fastapi import APIRouter, Depends, Path
 from fastapi.responses import JSONResponse
 
-from apexdevkit.annotation import deprecated
 from apexdevkit.error import DoesNotExistError, ExistsError, ForbiddenError
-from apexdevkit.fastapi.schema import DataclassFields, RestfulSchema, SchemaFields
+from apexdevkit.fastapi.schema import RestfulSchema, SchemaFields
 from apexdevkit.fastapi.service import RawCollection, RawItem, RestfulService
 from apexdevkit.testing import RestfulName
 
@@ -100,7 +99,6 @@ class RestfulServiceBuilder(ABC):
         pass
 
 
-@deprecated("Use infra instead")
 @dataclass
 class PreBuiltRestfulService(RestfulServiceBuilder):  # pragma: no cover
     service: RestfulService
@@ -149,12 +147,6 @@ class RestfulRouter:
     def item_path(self) -> str:
         return "/{" + self.id_alias + "}"
 
-    @deprecated("Use with_name and with_fields instead")
-    def with_dataclass(self, value: Any) -> Self:  # pragma: no cover
-        return self.with_name(RestfulName(value.__name__.lower())).with_fields(
-            DataclassFields(value)
-        )
-
     def with_name(self, value: RestfulName) -> Self:
         self.name = value
 
@@ -170,12 +162,6 @@ class RestfulRouter:
 
         return self
 
-    @deprecated("Use with_infra instead")
-    def with_service(self, value: RestfulService) -> Self:  # pragma: no cover
-        self.infra = PreBuiltRestfulService(value)
-
-        return self
-
     def with_infra(self, value: RestfulServiceBuilder) -> Self:
         self.infra = value
 
@@ -481,6 +467,106 @@ class RestfulRouter:
 
         return endpoint
 
+    def with_replace_one_endpoint(
+        self,
+        is_documented: bool = True,
+        extract_user: Callable[..., Any] = no_user,
+    ) -> Self:
+        self.router.add_api_route(
+            "",
+            self.replace_one(
+                User=Annotated[
+                    Any,
+                    Depends(extract_user),
+                ],
+                ParentId=Annotated[
+                    str,
+                    Path(alias=self.parent_id_alias, default_factory=str),
+                ],
+                Item=Annotated[
+                    RawItem,
+                    Depends(self.schema.for_replace_one()),
+                ],
+            ),
+            methods=["PUT"],
+            status_code=200,
+            responses={404: {}},
+            response_model=self.schema.for_no_data(),
+            include_in_schema=is_documented,
+            summary="Replace One",
+        )
+
+        return self
+
+    def replace_one(self, User, ParentId, Item) -> Callable[..., _Response]:  # type: ignore
+        def endpoint(user: User, parent_id: ParentId, item: Item) -> _Response:
+            try:
+                service = self.infra.with_user(user).with_parent(parent_id).build()
+            except DoesNotExistError as e:
+                return JSONResponse(
+                    RestfulResponse(RestfulName(self.parent)).not_found(e), 404
+                )
+            try:
+                service.replace_one(item)
+            except DoesNotExistError as e:
+                return JSONResponse(self.response.not_found(e), 404)
+            except ForbiddenError as e:
+                return JSONResponse(self.response.forbidden(e), 403)
+
+            return self.response.ok()
+
+        return endpoint
+
+    def with_replace_many_endpoint(
+        self,
+        is_documented: bool = True,
+        extract_user: Callable[..., Any] = no_user,
+    ) -> Self:
+        self.router.add_api_route(
+            "/batch",
+            self.replace_many(
+                User=Annotated[
+                    Any,
+                    Depends(extract_user),
+                ],
+                ParentId=Annotated[
+                    str,
+                    Path(alias=self.parent_id_alias, default_factory=str),
+                ],
+                Collection=Annotated[
+                    RawCollection,
+                    Depends(self.schema.for_replace_many()),
+                ],
+            ),
+            methods=["PUT"],
+            status_code=200,
+            responses={},
+            response_model=self.schema.for_no_data(),
+            include_in_schema=is_documented,
+            summary="Replace Many",
+        )
+
+        return self
+
+    def replace_many(self, User, ParentId, Collection) -> Callable[..., _Response]:  # type: ignore
+        def endpoint(user: User, parent_id: ParentId, items: Collection) -> _Response:
+            try:
+                service = self.infra.with_user(user).with_parent(parent_id).build()
+            except DoesNotExistError as e:
+                return JSONResponse(
+                    RestfulResponse(RestfulName(self.parent)).not_found(e), 404
+                )
+            try:
+                service.replace_many(items)
+            except DoesNotExistError as e:
+                return JSONResponse(self.response.not_found(e), 404)
+            except ForbiddenError as e:
+                return JSONResponse(self.response.forbidden(e), 403)
+
+            return self.response.ok()
+
+        return endpoint
+
     def with_delete_one_endpoint(
         self,
         is_documented: bool = True,

{apexdevkit-1.5.14 → apexdevkit-1.5.16}/apexdevkit/fastapi/schema.py

@@ -5,7 +5,6 @@ from typing import Any, Callable, Iterable, List
 
 from pydantic import BaseModel, create_model
 
-from apexdevkit.annotation import deprecated
 from apexdevkit.http import JsonDict
 from apexdevkit.testing import RestfulName
 
@@ -25,15 +24,6 @@ class SchemaFields(ABC):
         pass
 
 
-@deprecated("Use custom schema fields instead")
-@dataclass
-class DataclassFields(SchemaFields):  # pragma: no cover
-    source: Any
-
-    def readable(self) -> JsonDict:
-        return JsonDict(self.source.__annotations__)
-
-
 @dataclass
 class RestfulSchema:
     name: RestfulName
@@ -43,6 +33,7 @@ class RestfulSchema:
         schema = self._schema_for("", self.fields.readable())
         create_schema = self._schema_for("Create", self.fields.writable())
         self._schema_for("Update", self.fields.editable())
+        replace_schema = self._schema_for("Replace", self.fields.readable())
         update_many_item = self._schema_for(
             "UpdateManyItem", self.fields.editable().merge(self.fields.id())
         )
@@ -64,6 +55,9 @@ class RestfulSchema:
             "UpdateMany",
             JsonDict({self.name.plural: List[update_many_item]}),
         )
+        self._schema_for(
+            "ReplaceMany", JsonDict({self.name.plural: List[replace_schema]})
+        )
 
     def _schema_for(self, action: str, fields: dict[str, Any]) -> type[BaseModel]:
         if action not in self.schemas:
@@ -139,3 +133,19 @@ class RestfulSchema:
             return [dict(item) for item in request.model_dump()[self.name.plural]]
 
         return _
+
+    def for_replace_one(self) -> Callable[[BaseModel], dict[str, Any]]:
+        schema = self.schemas["Replace"]
+
+        def _(request: schema) -> dict[str, Any]:
+            return request.model_dump()
+
+        return _
+
+    def for_replace_many(self) -> Callable[[BaseModel], Iterable[dict[str, Any]]]:
+        schema = self.schemas["ReplaceMany"]
+
+        def _(request: schema) -> Iterable[dict[str, Any]]:
+            return [dict(item) for item in request.model_dump()[self.name.plural]]
+
+        return _

{apexdevkit-1.5.14 → apexdevkit-1.5.16}/apexdevkit/fastapi/service.py

@@ -2,7 +2,7 @@ from abc import ABC
 from dataclasses import dataclass, field
 from typing import Any, Dict, Generic, Iterable, Self, TypeVar
 
-from apexdevkit.formatter import DataclassFormatter, Formatter
+from apexdevkit.formatter import Formatter
 from apexdevkit.repository.interface import Repository
 
 RawItem = dict[str, Any]
@@ -36,6 +36,12 @@ class RestfulService(ABC):  # pragma: no cover
     def update_many(self, items: RawCollectionWithId) -> RawCollection:
         raise NotImplementedError(self.update_many.__name__)
 
+    def replace_one(self, item: RawItem) -> RawItem:
+        raise NotImplementedError(self.replace_one.__name__)
+
+    def replace_many(self, items: RawCollection) -> RawCollection:
+        raise NotImplementedError(self.replace_many.__name__)
+
     def delete_one(self, item_id: str) -> None:
         raise NotImplementedError(self.delete_one.__name__)
 
@@ -45,15 +51,9 @@ ItemT = TypeVar("ItemT")
 
 @dataclass
 class RestfulRepositoryBuilder(Generic[ItemT]):
-    resource: type[ItemT] | None = field(init=False, default=None)
-    formatter: Formatter[ItemT] | None = field(init=False, default=None)
+    formatter: Formatter[ItemT] = field(init=False)
     repository: Repository[Any, ItemT] = field(init=False)
 
-    def with_resource(self, resource: type[ItemT]) -> Self:
-        self.resource = resource
-
-        return self
-
     def with_formatter(self, formatter: Formatter[ItemT]) -> Self:
         self.formatter = formatter
 
@@ -65,11 +65,6 @@ class RestfulRepositoryBuilder(Generic[ItemT]):
         return self
 
     def build(self) -> RestfulService:
-        if not self.formatter and self.resource:
-            self.with_formatter(DataclassFormatter(self.resource))
-
-        assert self.formatter, "Must provide either resource or formatter"
-
         return _RestfulNestedRepository(self.formatter, self.repository)
 
 
@@ -115,5 +110,15 @@ class _RestfulNestedRepository(RestfulService, Generic[ItemT]):
 
         return [self.formatter.dump(item) for item in updates]
 
+    def replace_one(self, item: RawItem) -> RawItem:
+        self.repository.update(self.formatter.load(item))
+
+        return item
+
+    def replace_many(self, items: RawCollection) -> RawCollection:
+        self.repository.update_many([self.formatter.load(item) for item in items])
+
+        return items
+
     def delete_one(self, item_id: str) -> None:
         self.repository.delete(item_id)

{apexdevkit-1.5.14 → apexdevkit-1.5.16}/apexdevkit/testing/rest.py

@@ -19,6 +19,9 @@ class RestResource:
     def create_one(self) -> CreateOne:
         return CreateOne(self.name, self.http)
 
+    def create_many(self) -> CreateMany:
+        return CreateMany(self.name, self.http)
+
     def read_one(self) -> ReadOne:
         return ReadOne(self.name, self.http)
 
@@ -31,8 +34,11 @@ class RestResource:
     def update_many(self) -> UpdateMany:
         return UpdateMany(self.name, self.http)
 
-    def create_many(self) -> CreateMany:
-        return CreateMany(self.name, self.http)
+    def replace_one(self) -> ReplaceOne:
+        return ReplaceOne(self.name, self.http)
+
+    def replace_many(self) -> ReplaceMany:
+        return ReplaceMany(self.name, self.http)
 
     def delete_one(self) -> DeleteOne:
         return DeleteOne(self.name, self.http)
@@ -182,6 +188,20 @@ class UpdateOne(RestRequest):
         return self
 
 
+@dataclass
+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 from_data(self, value: JsonDict) -> Self:
+        self.data = value
+
+        return self
+
+
 @dataclass
 class CreateMany(RestRequest):
     data: list[JsonDict] = field(default_factory=list)
@@ -222,6 +242,26 @@ class UpdateMany(RestRequest):
         return self.from_data(value)
 
 
+@dataclass
+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 from_data(self, value: JsonDict) -> Self:
+        self.data.append(value)
+
+        return self
+
+    def and_data(self, value: JsonDict) -> Self:
+        return self.from_data(value)
+
+
 @dataclass
 class DeleteOne(RestRequest):
     item_id: str = field(init=False)

{apexdevkit-1.5.14 → apexdevkit-1.5.16}/pyproject.toml

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