Merge pull request #53 from grillazz/46-switch-to-python-311

46 switch to python 311

greens/routers/v1/vegs.py

@@ -26,15 +26,16 @@ async def add_document(payload: Document):
     """
     try:
         # payload = jsonable_encoder(payload)
-        return await create_document(payload, collection)
+        document = await create_document(payload, collection)
+        return {"id": str(document.inserted_id)}
     except ValueError as exception:
-        raise NotFoundHTTPException(msg=str(exception))
+        raise NotFoundHTTPException(msg=str(exception)) from exception
 
 
 @router.get(
     "/{object_id}",
     response_description="Document retrieved",
-    # response_model=DocumentResponse,
+    response_model=DocumentResponse,
 )
 async def get_document(object_id: ObjectIdField):
     """
@@ -45,7 +46,7 @@ async def get_document(object_id: ObjectIdField):
     try:
         return await retrieve_document(object_id, collection)
     except ValueError as exception:
-        raise NotFoundHTTPException(msg=str(exception))
+        raise NotFoundHTTPException(msg=str(exception)) from exception
 
 
 # TODO: PUT for replace aka set PATCH for update ?

greens/schemas/vegs.py

@@ -4,19 +4,6 @@
 from typing_extensions import Annotated
 
 
-# class ObjectIdField(str):
-#     @classmethod
-#     def __get_validators__(cls):
-#         yield cls.validate
-#
-#     @classmethod
-#     def validate(cls, value):
-#         try:
-#             return ObjectId(str(value))
-#         except InvalidId as e:
-#             raise ValueError("Not a valid ObjectId") from e
-
-
 def check_object_id(value: str) -> str:
     if not _ObjectId.is_valid(value):
         raise ValueError('Invalid ObjectId')
@@ -36,5 +23,5 @@ class Document(BaseModel):
     desc: str = Field(...)
 
 
-class DocumentResponse(Document):
-    id: ObjectIdField
+class DocumentResponse(BaseModel):
+    id: ObjectIdField = Field(...)

greens/services/repository.py

@@ -1,5 +1,6 @@
 from bson import ObjectId
 from pymongo.errors import WriteError
+from pymongo.results import InsertOneResult
 
 import greens.main as greens
 from greens.routers.exceptions import AlreadyExistsHTTPException
@@ -24,20 +25,19 @@ async def retrieve_document(document_id: str, collection: str) -> dict:
         raise ValueError(f"No document found for {document_id=} in {collection=}")
 
 
-async def create_document(document, collection: str) -> dict:
+async def create_document(document, collection: str) -> InsertOneResult:
     """
 
     :param document:
     :param collection:
     :return:
     """
     try:
-        document = await greens.app.state.mongo_collection[collection].insert_one(document.model_dump())
-        # TODO: return await retrieve_document(document.inserted_id, collection)
-        return True
-    except WriteError:
-        raise AlreadyExistsHTTPException(f"Document with {document.inserted_id=} already exists")
-
+        document: InsertOneResult = await greens.app.state.mongo_collection[collection].insert_one(document.model_dump())
+        return document
+    except WriteError as e:
+        # TODO: this not make sense as id from mongo will be always unique if we not pass it
+        raise AlreadyExistsHTTPException(msg=str(e)) from e
 
 async def get_mongo_meta() -> dict:
     list_databases = await greens.app.state.mongo_client.list_database_names()