fix: remove optional schema and alter base out (#49)

* fix: remove optional schema and alter base out

* changes

creyPY/fastapi/crud.py

@@ -67,7 +67,6 @@ def get_object_or_404(
             row = result.scalar_one_or_none()
             if row is None:
                 raise HTTPException(status_code=404, detail="The object does not exist.")
-
             obj_dict = row
         if expunge:
             await db.expunge(obj_dict)

creyPY/fastapi/schemas/__init__.py

@@ -1,2 +1,2 @@
 from .base import *  # noqa
-from .response_schema import * #noqa
+from .schema_optional import * #noqa

creyPY/fastapi/schemas/base.py

@@ -11,6 +11,6 @@ class BaseSchemaModelIN(BaseModel):
 
 
 class BaseSchemaModelOUT(BaseSchemaModelIN):
-    id: UUID | str
+    id: UUID
     created_at: datetime
     updated_at: datetime

creyPY/fastapi/schemas/response_schema.py

@@ -1,43 +0,0 @@
-from typing import List, Optional, Type
-
-from fastapi import Query
-from pydantic import BaseModel, create_model
-
-
-class ResponseModelDependency:
-    def __init__(self, model_class: Type[BaseModel]):
-        self.model_class = model_class
-
-    def __call__(self, response_fields: Optional[List[str]] = Query(None)) -> Type[BaseModel]:
-        def process_result(result, fields=None, async_session=False):
-            if not fields:
-                if async_session:
-                    return {k: v for k, v in result.__dict__.items() if not k.startswith("_")}
-                return result
-
-            if hasattr(result, "_fields"):
-                row_fields = result._fields
-                return dict(zip(row_fields, result))
-            elif isinstance(result, tuple):
-                return dict(zip(fields, result))
-            elif isinstance(result, dict):
-                return result
-            else:
-                return {field: getattr(result, field) for field in fields if hasattr(result, field)}
-
-        if not response_fields:
-            return self.model_class, None, process_result
-
-        all_annotations = {}
-        for cls in self.model_class.__mro__:
-            if hasattr(cls, "__annotations__"):
-                all_annotations.update(cls.__annotations__)
-
-        fields = {}
-        for field in response_fields:
-            if field in all_annotations:
-                fields[field] = (all_annotations[field], None)
-
-        dynamic_model = create_model(f"Dynamic{self.model_class.__name__}", **fields)
-
-        return dynamic_model, response_fields, process_result

creyPY/fastapi/schemas/schema_optional.py

@@ -0,0 +1,19 @@
+from typing import Optional, Type, Union, get_args, get_origin, get_type_hints
+
+from pydantic import BaseModel, create_model
+
+
+def optional_fields(cls: Type[BaseModel]) -> Type[BaseModel]:
+    fields = {}
+    for name, hint in get_type_hints(cls).items():
+        if name.startswith("_"):
+            continue
+
+        if get_origin(hint) is not Union or type(None) not in get_args(hint):
+            hint = Optional[hint]
+
+        fields[name] = (hint, None)
+
+    new_model = create_model(cls.__name__, __base__=cls, **fields)
+
+    return new_model

requirements.stripe.txt

@@ -1 +1 @@
-stripe==11.6.0 # Stripe
+stripe==12.0.0 # Stripe