sharedkernel 1.9.0__tar.gz → 2.0.0__tar.gz

{sharedkernel-1.9.0 → sharedkernel-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sharedkernel
-Version: 1.9.0
+Version: 2.0.0
 Summary: sharekernel is a shared package between all python projects
 Author: Smilinno
 Description-Content-Type: text/markdown
@@ -9,7 +9,6 @@ Requires-Dist: requests
 Requires-Dist: pymongo
 Requires-Dist: fastapi==0.111.0
 Requires-Dist: PyJWT
-Requires-Dist: chromadb
 Requires-Dist: persian_tools
 Requires-Dist: sentry-sdk
 Requires-Dist: jdatetime
@@ -24,6 +23,10 @@ Requires-Dist: beautifulsoup4
 this a shared kernel package
 
 # Change Log
+### Version 2.0.0
+- Update pydantic version
+- Delete vector databases
+- Implement JsonStringModel
 ### Version 1.9.0
 - Implement DataFormatConverter
 ### Version 1.8.0

{sharedkernel-1.9.0 → sharedkernel-2.0.0}/README.md

@@ -2,6 +2,10 @@
 this a shared kernel package
 
 # Change Log
+### Version 2.0.0
+- Update pydantic version
+- Delete vector databases
+- Implement JsonStringModel
 ### Version 1.9.0
 - Implement DataFormatConverter
 ### Version 1.8.0

{sharedkernel-1.9.0 → sharedkernel-2.0.0}/setup.py

@@ -13,7 +13,6 @@ setup(
     packages=[
         "sharedkernel",
         "sharedkernel.database",
-        "sharedkernel.database.vector_database_repository",
         "sharedkernel.enum",
         "sharedkernel.exception",
         "sharedkernel.objects",
@@ -26,8 +25,6 @@ setup(
         "pymongo",
         "fastapi==0.111.0",
         "PyJWT",
-        #"pymilvus",
-        "chromadb",
         "persian_tools",
         "sentry-sdk",
         "jdatetime",
@@ -39,7 +36,7 @@ setup(
         "beautifulsoup4"
     ],
     # *strongly* suggested for sharing
-    version="1.9.0",
+    version="2.0.0",
     description="sharekernel is a shared package between all python projects",
     long_description=long_description,
     long_description_content_type="text/markdown",

sharedkernel-2.0.0/sharedkernel/database/__init__.py

@@ -0,0 +1 @@
+# from .mongo_repository_base import MongoRepositoryBase

{sharedkernel-1.9.0 → sharedkernel-2.0.0}/sharedkernel/database/mongo_generic_repository.py

@@ -1,7 +1,7 @@
 from pymongo import MongoClient
 from bson import ObjectId
 from typing import Generic, TypeVar, List, Type
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 from sharedkernel.string_extentions import camel_to_snake
 
 T = TypeVar("T", bound=BaseModel)
@@ -21,8 +21,7 @@ class MongoGenericRepository(Generic[T]):
     def find_one(self, id: str) -> T:
         query = {"_id": ObjectId(id), "is_deleted": False}
         result = self.collection.find_one(query)
-        return self._map_to_model(result) if result else None
-    
+        return self._map_to_model(result) if result else None   
 
     def insert_one(self, data: T) -> str:
         delattr(data, "id")

sharedkernel-2.0.0/sharedkernel/enum/error_code.py

@@ -0,0 +1,10 @@
+from enum import Enum
+
+
+class ErrorCode(str, Enum):
+    Item_NotFound = "یافت نشد"
+    Internal_Server = "خطایی در سیستم رخ داده است"
+    UnAuthorized = "توکن دسترسی معتبر نمی باشد"
+    Success = "با موفقیت انجام شد"
+    Intents_Count_Should_Equal_One = "فقط یک اینتنت میتوانید وارد نمایید"
+    Unsupported_Date_Type = "تاریخ داده شده پیشتیبانی نمیشود."

{sharedkernel-1.9.0 → sharedkernel-2.0.0}/sharedkernel/objects/base_document.py

@@ -1,10 +1,9 @@
 from pydantic import BaseModel, Field
-from typing import Optional
 from datetime import datetime
 
 
 class BaseDocument(BaseModel):
-    id: Optional[str]
-    is_deleted: bool = False
+    id: str | None = None
+    is_deleted: bool | None = False
     created_on: datetime = Field(default_factory=datetime.now)
     updated_on: datetime = Field(default_factory=datetime.now)

sharedkernel-2.0.0/sharedkernel/objects/json_string_model.py

@@ -0,0 +1,27 @@
+import json
+from typing import Any
+from pydantic import BaseModel, model_validator
+
+
+class JsonStringModel(BaseModel):
+    """`BaseModel` subclass used to validate objects passed to API as JSON strings.
+
+    The primary use case is treating one of the form fields as JSON payload. We need to do that
+    in case of endpoints that accept both file and rich set of input parameters. We cannot receive
+    both file and JSON body because they use conflicting Content-Type header. It is
+    "multipart/form-data" for the former and "application/json" for the latter. If we require
+    a client to send a file, we have to use the data sent in form for input parameters.
+
+    Theoretically we could use several form fields to gather all the required input parameters.
+    However, some of them are nested in their nature and forms don't support that. That's why we
+    consider it better to just use one form field and process its content as JSON payload.
+
+    If a form field model inherits from this class, we will get API documentation and input
+    validation - just the way we get it for JSON body defined with `BaseModel`.
+    """
+    @model_validator(mode='before')
+    @classmethod
+    def validate_to_json(cls, value: Any) -> Any:
+        if isinstance(value, str):
+            return cls(**json.loads(value))
+        return value

{sharedkernel-1.9.0 → sharedkernel-2.0.0}/sharedkernel/objects/result.py

@@ -1,10 +1,6 @@
-from pydantic import BaseModel
-
 from typing import Generic, TypeVar
-
 from pydantic import BaseModel
-from pydantic.generics import GenericModel
-
+from pydantic import BaseModel
 from sharedkernel.enum.error_code import ErrorCode
 
 ResultT = TypeVar("ResultT")
@@ -13,16 +9,16 @@ ResultT = TypeVar("ResultT")
 class BaseResult(BaseModel):
     isSucceed:bool = True
     message: str = ErrorCode.Success.value
-    errorCode: str = None
+    errorCode: str | None = None
 
-class Result(BaseResult,GenericModel, Generic[ResultT]):
-    data: ResultT =None
+class Result(BaseResult, Generic[ResultT]):
+    data: ResultT = None
 
     def __init__(
         self,
         isSucceed:bool = True,
-        data: object = None,
+        data: object | None = None,
         message: str = ErrorCode.Success.value,
-        errorCode: str = None
+        errorCode: str | None = None
         )-> None:
-        super().__init__(isSucceed= isSucceed, data= data, message= message, errorCode= errorCode)
+        super().__init__(isSucceed=isSucceed, data=data, message=message, errorCode=errorCode)

{sharedkernel-1.9.0 → sharedkernel-2.0.0}/sharedkernel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sharedkernel
-Version: 1.9.0
+Version: 2.0.0
 Summary: sharekernel is a shared package between all python projects
 Author: Smilinno
 Description-Content-Type: text/markdown
@@ -9,7 +9,6 @@ Requires-Dist: requests
 Requires-Dist: pymongo
 Requires-Dist: fastapi==0.111.0
 Requires-Dist: PyJWT
-Requires-Dist: chromadb
 Requires-Dist: persian_tools
 Requires-Dist: sentry-sdk
 Requires-Dist: jdatetime
@@ -24,6 +23,10 @@ Requires-Dist: beautifulsoup4
 this a shared kernel package
 
 # Change Log
+### Version 2.0.0
+- Update pydantic version
+- Delete vector databases
+- Implement JsonStringModel
 ### Version 1.9.0
 - Implement DataFormatConverter
 ### Version 1.8.0

{sharedkernel-1.9.0 → sharedkernel-2.0.0}/sharedkernel.egg-info/SOURCES.txt

@@ -14,13 +14,8 @@ sharedkernel.egg-info/requires.txt
 sharedkernel.egg-info/top_level.txt
 sharedkernel/database/__init__.py
 sharedkernel/database/mongo_generic_repository.py
-sharedkernel/database/vector_database_repository/__init__.py
-sharedkernel/database/vector_database_repository/chroma_startegy.py
-sharedkernel/database/vector_database_repository/vector_database_repository.py
-sharedkernel/database/vector_database_repository/vector_database_strategy.py
 sharedkernel/enum/__init__.py
 sharedkernel/enum/error_code.py
-sharedkernel/enum/vector_database_type.py
 sharedkernel/exception/__init__.py
 sharedkernel/exception/exception.py
 sharedkernel/exception/exception_handlers.py
@@ -29,5 +24,6 @@ sharedkernel/normalizer/number_normalizer.py
 sharedkernel/normalizer/phone_number_normalizer.py
 sharedkernel/objects/__init__.py
 sharedkernel/objects/base_document.py
+sharedkernel/objects/json_string_model.py
 sharedkernel/objects/jwt_model.py
 sharedkernel/objects/result.py

{sharedkernel-1.9.0 → sharedkernel-2.0.0}/sharedkernel.egg-info/requires.txt

@@ -3,7 +3,6 @@ requests
 pymongo
 fastapi==0.111.0
 PyJWT
-chromadb
 persian_tools
 sentry-sdk
 jdatetime

sharedkernel-1.9.0/sharedkernel/database/__init__.py

@@ -1,2 +0,0 @@
-from .vector_database_repository import VectorRepository
-# from .mongo_repository_base import MongoRepositoryBase

sharedkernel-1.9.0/sharedkernel/database/vector_database_repository/__init__.py

@@ -1,2 +0,0 @@
-from .chroma_startegy import ChromaStrategy
-from .vector_database_repository import VectorRepository

sharedkernel-1.9.0/sharedkernel/database/vector_database_repository/chroma_startegy.py

@@ -1,39 +0,0 @@
-import chromadb
-import numpy as np
-from chromadb.config import Settings
-from .vector_database_strategy import VectorDatabaseStrategy
-import uuid
-
-
-class ChromaStrategy(VectorDatabaseStrategy):
-    def __init__(self, collection_name: str):
-        self.collection_name = collection_name
-        self.collection = None
-
-    def connect(self, host: str = "localhost", port: int = 8000):
-        client = chromadb.Client(
-            Settings(
-                chroma_api_impl="rest",
-                chroma_server_host=host,
-                chroma_server_http_port=port,
-            )
-        )
-        self.collection = client.get_or_create_collection(self.collection_name)
-
-    def insert_vector(self, vector: np.ndarray, metadata: dict) -> str:
-        id = str(uuid.uuid4())
-        self.collection.upsert(ids=id, embeddings=vector.tolist(), metadatas=[metadata])
-
-        return id
-
-    def search_vector(self, vector: np.ndarray, top_k: int):
-        results = self.collection.query(vectors=[vector.tolist()], n_results=top_k)
-        return results
-
-    def get_vector_by_id(self, id: str):
-        result = self.collection.get(ids=id)
-
-        return result
-
-    def delete_vector(self, id: str):
-        self.collection.delete(ids=id)

sharedkernel-1.9.0/sharedkernel/database/vector_database_repository/vector_database_repository.py

@@ -1,28 +0,0 @@
-import numpy as np
-from .vector_database_strategy import VectorDatabaseStrategy
-# from .milvus_strategy import MilvusStrategy
-from .chroma_startegy import ChromaStrategy
-from sharedkernel.enum.vector_database_type import VectorDatabaseType
-
-class VectorRepository:
-    def __init__(self, database_type: VectorDatabaseType, collection_name: str, **connection_params):
-        self.strategy = self._get_strategy(database_type, collection_name)
-        self.strategy.connect(**connection_params)
-    
-    def _get_strategy(self, database_type: VectorDatabaseType, collection_name: str) -> VectorDatabaseStrategy:
-        # if database_type == VectorDatabaseType.MILVUS:
-        #     return MilvusStrategy(collection_name)
-        # else:
-        return ChromaStrategy(collection_name)
-    
-    def add_vector(self, vector: np.ndarray, metadata: dict) -> str:
-        return self.strategy.insert_vector(vector, metadata)
-    
-    def find_similar_vectors(self, vector: np.ndarray, top_k: int):
-        return self.strategy.search_vector(vector, top_k)
-    
-    def remove_vector(self, id: str):
-        self.strategy.delete_vector(id)
-
-    def get_vector_by_id(self, id: str):
-       return self.strategy.get_vector_by_id(id)

sharedkernel-1.9.0/sharedkernel/database/vector_database_repository/vector_database_strategy.py

@@ -1,22 +0,0 @@
-from abc import ABC, abstractmethod
-import numpy as np
-
-class VectorDatabaseStrategy(ABC):
-    @abstractmethod
-    def connect(self, **kwargs):
-        pass
-    @abstractmethod
-    def insert_vector(self, vector: np.ndarray, metadata: dict) -> str:
-        pass
-    
-    @abstractmethod
-    def search_vector(self, vector: np.ndarray, top_k: int):
-        pass
-    
-    @abstractmethod
-    def delete_vector(self, id: str):
-        pass
-    
-    @abstractmethod
-    def get_vector_by_id(self, id: str):
-        pass

sharedkernel-1.9.0/sharedkernel/enum/error_code.py

@@ -1,14 +0,0 @@
-from enum import Enum
-
-class ErrorCode(str, Enum):
-    Item_NotFound= "یافت نشد"
-
-    Internal_Server= "خطایی در سیستم رخ داده است"
-
-    UnAuthorized= "توکن دسترسی معتبر نمی باشد"
-
-    Success= "با موفقیت انجام شد"
-    
-    Intents_Count_Should_Equal_One= "فقط یک اینتنت میتوانید وارد نمایید"
-
-    Unsupported_Date_Type = "تاریخ داده شده پیشتیبانی نمیشود."

sharedkernel-1.9.0/sharedkernel/enum/vector_database_type.py

@@ -1,5 +0,0 @@
-from enum import Enum
-
-class VectorDatabaseType(Enum):
-    MILVUS = "milvus"
-    CHROMA = "chroma"