sharedkernel 1.5.2__tar.gz → 1.6.1__tar.gz

{sharedkernel-1.5.2 → sharedkernel-1.6.1}/PKG-INFO

@@ -1,53 +1,57 @@
-Metadata-Version: 2.1
-Name: sharedkernel
-Version: 1.5.2
-Summary: sharekernel is an shared package between all python projects
-Author: Smilinno
-Description-Content-Type: text/markdown
-Requires-Dist: numpy
-Requires-Dist: requests
-Requires-Dist: pymongo
-Requires-Dist: fastapi==0.111.0
-Requires-Dist: PyJWT
-Requires-Dist: pymilvus
-Requires-Dist: chromadb
-Requires-Dist: persian_tools
-Requires-Dist: sentry-sdk
-Requires-Dist: jdatetime
-Requires-Dist: persiantools
-
-# SharedKernel
-this a shared kernel package
-
-# Change Log
-### Version 1.5.2
-- add created_on to base_document
-### Version 1.5.1
-- fix mongo repository bug
-### Version 1.5.0
-- implement date converter
-  -  example: فردا - دیروز - یک ماه قبل
-### Version 1.4.5
-- upgrade fastapi version
-### Version 1.4.4
-- Fix regex masking bugs
-### Version 1.4.3
-- Fix collection bug in MongoGenericRepository
-### Version 1.4.2
-- Fix minor bugs
-### Version 1.4.1
-- Fix minor bug in MongoGenericRepository
-### Version 1.4.0
-- Implement date convertor for jalali and georgian
-### Version 1.3.0
-- Implement Sentry For Log Exceptions
-### Version 1.2.0
-- Implement Regex Masking
-# Create Package
-    py -m pip install --upgrade build
-    py -m build
-    py -m pip install --upgrade twine
-    py -m twine upload dist/*
-
-# Pypi
-pip install sharedkernel
+Metadata-Version: 2.1
+Name: sharedkernel
+Version: 1.6.1
+Summary: sharekernel is a shared package between all python projects
+Author: Smilinno
+Description-Content-Type: text/markdown
+Requires-Dist: numpy
+Requires-Dist: requests
+Requires-Dist: pymongo
+Requires-Dist: fastapi==0.111.0
+Requires-Dist: PyJWT
+Requires-Dist: pymilvus
+Requires-Dist: chromadb
+Requires-Dist: persian_tools
+Requires-Dist: sentry-sdk
+Requires-Dist: jdatetime
+Requires-Dist: persiantools
+
+# SharedKernel
+this a shared kernel package
+
+# Change Log
+### Version 1.6.1
+- Minor update normalize functions
+### Version 1.6
+- Add phone number normalizer
+### Version 1.5.2
+- Add created_on to base_document
+### Version 1.5.1
+- fix mongo repository bug
+### Version 1.5.0
+- implement date converter
+  -  example: فردا - دیروز - یک ماه قبل
+### Version 1.4.5
+- upgrade fastapi version
+### Version 1.4.4
+- Fix regex masking bugs
+### Version 1.4.3
+- Fix collection bug in MongoGenericRepository
+### Version 1.4.2
+- Fix minor bugs
+### Version 1.4.1
+- Fix minor bug in MongoGenericRepository
+### Version 1.4.0
+- Implement date convertor for jalali and georgian
+### Version 1.3.0
+- Implement Sentry For Log Exceptions
+### Version 1.2.0
+- Implement Regex Masking
+# Create Package
+    py -m pip install --upgrade build
+    py -m build
+    py -m pip install --upgrade twine
+    py -m twine upload dist/*
+
+# Pypi
+pip install sharedkernel

{sharedkernel-1.5.2 → sharedkernel-1.6.1}/README.md

@@ -2,8 +2,12 @@
 this a shared kernel package
 
 # Change Log
+### Version 1.6.1
+- Minor update normalize functions
+### Version 1.6
+- Add phone number normalizer
 ### Version 1.5.2
-- add created_on to base_document
+- Add created_on to base_document
 ### Version 1.5.1
 - fix mongo repository bug
 ### Version 1.5.0

{sharedkernel-1.5.2 → sharedkernel-1.6.1}/setup.cfg

@@ -1,4 +1,4 @@
-[egg_info]
-tag_build = 
-tag_date = 0
-
+[egg_info]
+tag_build = 
+tag_date = 0
+

{sharedkernel-1.5.2 → sharedkernel-1.6.1}/setup.py

@@ -1,40 +1,40 @@
-from setuptools import setup
-
-# read the contents of your README file
-from pathlib import Path
-
-this_directory = Path(__file__).parent
-long_description = (this_directory / "README.md").read_text()
-
-setup(
-    # Needed to silence warnings (and to be a worthwhile package)
-    name="sharedkernel",
-    author="Smilinno",
-    packages=[
-        "sharedkernel",
-        "sharedkernel.database",
-        "sharedkernel.database.vector_database_repository",
-        "sharedkernel.enum",
-        "sharedkernel.exception",
-        "sharedkernel.objects",
-    ],
-    # Needed for dependencies
-    install_requires=[
-        "numpy",
-        "requests",
-        "pymongo",
-        "fastapi==0.111.0",
-        "PyJWT",
-        "pymilvus",
-        "chromadb",
-        "persian_tools",
-        "sentry-sdk",
-        "jdatetime",
-        "persiantools"
-    ],
-    # *strongly* suggested for sharing
-    version="1.5.2",
-    description="sharekernel is an shared package between all python projects",
-    long_description=long_description,
-    long_description_content_type="text/markdown",
-)
+from setuptools import setup
+
+# read the contents of your README file
+from pathlib import Path
+
+this_directory = Path(__file__).parent
+long_description = (this_directory / "README.md").read_text()
+
+setup(
+    # Needed to silence warnings (and to be a worthwhile package)
+    name="sharedkernel",
+    author="Smilinno",
+    packages=[
+        "sharedkernel",
+        "sharedkernel.database",
+        "sharedkernel.database.vector_database_repository",
+        "sharedkernel.enum",
+        "sharedkernel.exception",
+        "sharedkernel.objects",
+    ],
+    # Needed for dependencies
+    install_requires=[
+        "numpy",
+        "requests",
+        "pymongo",
+        "fastapi==0.111.0",
+        "PyJWT",
+        "pymilvus",
+        "chromadb",
+        "persian_tools",
+        "sentry-sdk",
+        "jdatetime",
+        "persiantools"
+    ],
+    # *strongly* suggested for sharing
+    version="1.6.1",
+    description="sharekernel is a shared package between all python projects",
+    long_description=long_description,
+    long_description_content_type="text/markdown",
+)

{sharedkernel-1.5.2 → sharedkernel-1.6.1}/sharedkernel/common.py

@@ -1,29 +1,29 @@
-import yaml
-import json
-
-def yaml2json(yaml_data:yaml) -> json:
-        
-    output = json.dumps(yaml.safe_load(yaml_data), indent=2)
-
-    return json.loads(output)
-
-def json2yaml(data) -> yaml:
-    
-    data=json.dumps(data,default=lambda o: del_none(o.__dict__))
-    
-    data=json.loads(data)
-    output = yaml.dump(data)
-    
-    return output
-
-def del_none(d):
-    """
-    Delete keys with the value ``None`` in a dictionary, recursively.
-    """
-
-    for key, value in list(d.items()):
-        if value is None:
-            del d[key]
-        elif isinstance(value, dict):
-            del_none(value)
-    return d  
+import yaml
+import json
+
+def yaml2json(yaml_data:yaml) -> json:
+        
+    output = json.dumps(yaml.safe_load(yaml_data), indent=2)
+
+    return json.loads(output)
+
+def json2yaml(data) -> yaml:
+    
+    data=json.dumps(data,default=lambda o: del_none(o.__dict__))
+    
+    data=json.loads(data)
+    output = yaml.dump(data)
+    
+    return output
+
+def del_none(d):
+    """
+    Delete keys with the value ``None`` in a dictionary, recursively.
+    """
+
+    for key, value in list(d.items()):
+        if value is None:
+            del d[key]
+        elif isinstance(value, dict):
+            del_none(value)
+    return d  

{sharedkernel-1.5.2 → sharedkernel-1.6.1}/sharedkernel/database/__init__.py

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

{sharedkernel-1.5.2 → sharedkernel-1.6.1}/sharedkernel/database/mongo_generic_repository.py

@@ -1,52 +1,52 @@
-from pymongo import MongoClient
-from bson import ObjectId
-from typing import Generic, TypeVar, List, Type
-from pydantic import BaseModel
-from sharedkernel.string_extentions import camel_to_snake
-
-T = TypeVar("T", bound=BaseModel)
-
-
-class MongoGenericRepository(Generic[T]):
-    def __init__(self, database: MongoClient, model: Type[T]):
-        self.database = database
-        self.__collection_name = camel_to_snake(model.__name__)
-        self.collection = self.database[self.__collection_name]
-        self.model = model
-
-    def _map_to_model(self, document: dict) -> T:
-        document["id"] = str(document.pop("_id"))
-        return self.model.parse_obj(document)
-
-    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
-    
-
-    def insert_one(self, data: T) -> str:
-        delattr(data, "id")
-        result = self.collection.insert_one(data.dict())
-        return str(result.inserted_id)
-
-    def insert_many(self, data: List[T]) -> List[str]:
-        data_list = [delattr(d.dict(), "id") for d in data]
-        result = self.collection.insert_many(data_list)
-        return [str(id_) for id_ in result.inserted_ids]
-
-    def update_one(self, id: str, data: T) -> int:
-        delattr(data, "id")
-        query = {"_id": ObjectId(id)}
-        result = self.collection.update_one(query, {"$set": data.dict()})
-        return result.modified_count
-
-    def delete_one(self, id: str) -> int:
-        query = {"_id": ObjectId(id)}
-        result = self.collection.delete_one(query)
-        return result.deleted_count
-
-    def get_all(self, page_number=1, page_size=10) -> List[T]:
-        skip_count = (page_number - 1) * page_size
-        query = {"is_deleted": False}
-        result = self.collection.find(query).skip(skip_count).limit(page_size)
-        return [self._map_to_model(doc) for doc in result]
+from pymongo import MongoClient
+from bson import ObjectId
+from typing import Generic, TypeVar, List, Type
+from pydantic import BaseModel
+from sharedkernel.string_extentions import camel_to_snake
+
+T = TypeVar("T", bound=BaseModel)
+
+
+class MongoGenericRepository(Generic[T]):
+    def __init__(self, database: MongoClient, model: Type[T]):
+        self.database = database
+        self.__collection_name = camel_to_snake(model.__name__)
+        self.collection = self.database[self.__collection_name]
+        self.model = model
+
+    def _map_to_model(self, document: dict) -> T:
+        document["id"] = str(document.pop("_id"))
+        return self.model.parse_obj(document)
+
+    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
+    
+
+    def insert_one(self, data: T) -> str:
+        delattr(data, "id")
+        result = self.collection.insert_one(data.dict())
+        return str(result.inserted_id)
+
+    def insert_many(self, data: List[T]) -> List[str]:
+        data_list = [delattr(d.dict(), "id") for d in data]
+        result = self.collection.insert_many(data_list)
+        return [str(id_) for id_ in result.inserted_ids]
+
+    def update_one(self, id: str, data: T) -> int:
+        delattr(data, "id")
+        query = {"_id": ObjectId(id)}
+        result = self.collection.update_one(query, {"$set": data.dict()})
+        return result.modified_count
+
+    def delete_one(self, id: str) -> int:
+        query = {"_id": ObjectId(id)}
+        result = self.collection.delete_one(query)
+        return result.deleted_count
+
+    def get_all(self, page_number=1, page_size=10) -> List[T]:
+        skip_count = (page_number - 1) * page_size
+        query = {"is_deleted": False}
+        result = self.collection.find(query).skip(skip_count).limit(page_size)
+        return [self._map_to_model(doc) for doc in result]

{sharedkernel-1.5.2 → sharedkernel-1.6.1}/sharedkernel/database/vector_database_repository/__init__.py

@@ -1,3 +1,3 @@
-from .chroma_startegy import ChromaStrategy
-from .milvus_strategy import MilvusStrategy
+from .chroma_startegy import ChromaStrategy
+from .milvus_strategy import MilvusStrategy
 from .vector_database_repository import VectorRepository

{sharedkernel-1.5.2 → sharedkernel-1.6.1}/sharedkernel/database/vector_database_repository/chroma_startegy.py

@@ -1,39 +1,39 @@
-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)
+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.5.2 → sharedkernel-1.6.1}/sharedkernel/database/vector_database_repository/milvus_strategy.py

@@ -1,50 +1,50 @@
-import numpy as np
-from pymilvus import connections, Collection, FieldSchema, CollectionSchema, DataType
-
-from .vector_database_strategy import VectorDatabaseStrategy
-import uuid
-
-
-class MilvusStrategy(VectorDatabaseStrategy):
-    def __init__(self, collection_name: str):
-        self.collection_name = collection_name
-        self.collection = None
-
-    def connect(self, host: str = "localhost", port: str = "19530"):
-        connections.connect(alias="default", host=host, port=port)
-        # Define fields
-        fields = [
-            FieldSchema(
-                name="id", dtype=DataType.VARCHAR, max_length=36, is_primary=True
-            ),
-            FieldSchema(name="vector", dtype=DataType.FLOAT_VECTOR, dim=128),
-        ]
-        schema = CollectionSchema(
-            fields, description="Vector collection", enable_dynamic_field=True
-        )
-        self.collection = Collection(name=self.collection_name, schema=schema)
-
-        if not self.collection.has_index():
-             self.collection.create_index(field_name="vector", index_params={"index_type": "IVF_FLAT", "metric_type": "L2", "params": {"nlist": 128}})
-
-        self.collection.load()
-
-    def insert_vector(self, vector: np.ndarray, metadata: dict) -> str:
-        id = str(uuid.uuid4())
-        self.collection.insert(data={"id": id, "vector": vector.tolist()})
- 
-        return id
-
-    def search_vector(self, vector: np.ndarray, top_k: int):
-        search_params = {"metric_type": "L2", "params": {"nprobe": 10}}
-        results = self.collection.search(
-            [vector.tolist()], "vector", search_params, top_k
-        )
-        return results
-
-    def get_vector_by_id(self, id: str):
-        result = self.collection.query(expr=f"id=='{id}'",output_fields=["vector"])
-        return result
-
-    def delete_vector(self, id: str):
-        self.collection.delete(expr=f"id=='{id}'")
+import numpy as np
+from pymilvus import connections, Collection, FieldSchema, CollectionSchema, DataType
+
+from .vector_database_strategy import VectorDatabaseStrategy
+import uuid
+
+
+class MilvusStrategy(VectorDatabaseStrategy):
+    def __init__(self, collection_name: str):
+        self.collection_name = collection_name
+        self.collection = None
+
+    def connect(self, host: str = "localhost", port: str = "19530"):
+        connections.connect(alias="default", host=host, port=port)
+        # Define fields
+        fields = [
+            FieldSchema(
+                name="id", dtype=DataType.VARCHAR, max_length=36, is_primary=True
+            ),
+            FieldSchema(name="vector", dtype=DataType.FLOAT_VECTOR, dim=128),
+        ]
+        schema = CollectionSchema(
+            fields, description="Vector collection", enable_dynamic_field=True
+        )
+        self.collection = Collection(name=self.collection_name, schema=schema)
+
+        if not self.collection.has_index():
+             self.collection.create_index(field_name="vector", index_params={"index_type": "IVF_FLAT", "metric_type": "L2", "params": {"nlist": 128}})
+
+        self.collection.load()
+
+    def insert_vector(self, vector: np.ndarray, metadata: dict) -> str:
+        id = str(uuid.uuid4())
+        self.collection.insert(data={"id": id, "vector": vector.tolist()})
+ 
+        return id
+
+    def search_vector(self, vector: np.ndarray, top_k: int):
+        search_params = {"metric_type": "L2", "params": {"nprobe": 10}}
+        results = self.collection.search(
+            [vector.tolist()], "vector", search_params, top_k
+        )
+        return results
+
+    def get_vector_by_id(self, id: str):
+        result = self.collection.query(expr=f"id=='{id}'",output_fields=["vector"])
+        return result
+
+    def delete_vector(self, id: str):
+        self.collection.delete(expr=f"id=='{id}'")

{sharedkernel-1.5.2 → sharedkernel-1.6.1}/sharedkernel/database/vector_database_repository/vector_database_repository.py

@@ -1,28 +1,28 @@
-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):
+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)