organizations-local 0.0.47__tar.gz → 0.0.48__tar.gz

{organizations_local-0.0.47 → organizations_local-0.0.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: organizations-local
-Version: 0.0.47
+Version: 0.0.48
 Summary: PyPI Package for Circles organizations-local Python
 Home-page: https://github.com/circles-zone/organizations-local-python-package
 Author: Circles

organizations_local-0.0.48/organizations_local/src/organizations_constants.py

@@ -0,0 +1,19 @@
+from logger_local.LoggerComponentEnum import LoggerComponentEnum
+
+ORGANIZATIONS_LOCAL_PYTHON_COMPONENT_ID = 286
+ORGANIZATIONS_LOCAL_PYTHON_COMPONENT_NAME = "organization-local-python-package"
+DEVELOPER_EMAIL = "tal.g@circ.zone"
+ORGANIZATIONS_PYTHON_PACKAGE_CODE_LOGGER_OBJECT = {
+    "component_id": ORGANIZATIONS_LOCAL_PYTHON_COMPONENT_ID,
+    "component_name": ORGANIZATIONS_LOCAL_PYTHON_COMPONENT_NAME,
+    "component_category": LoggerComponentEnum.ComponentCategory.Code.value,
+    "developer_email": DEVELOPER_EMAIL,
+}
+
+ORGANIZATIONS_PYTHON_PACKAGE_TEST_LOGGER_OBJECT = {
+    "component_id": ORGANIZATIONS_LOCAL_PYTHON_COMPONENT_ID,
+    "component_name": ORGANIZATIONS_LOCAL_PYTHON_COMPONENT_NAME,
+    "component_category": LoggerComponentEnum.ComponentCategory.Unit_Test.value,
+    "testing_framework": LoggerComponentEnum.testingFramework.pytest.value,
+    "developer_email": DEVELOPER_EMAIL,
+}

{organizations_local-0.0.47 → organizations_local-0.0.48}/organizations_local/src/organizations_local.py

@@ -45,7 +45,7 @@ DEFAULT_NOT_DELETED_ML_VIEW_NAME = "organization_ml_not_deleted_view"
 #     "start_timestamp",
 #     "end_timestamp",
 #     "main_group_id"
-# 
+#
 # organization_ml_table fields:
 #     "organization_ml_id",
 #     "organization_id",
@@ -57,27 +57,49 @@ DEFAULT_NOT_DELETED_ML_VIEW_NAME = "organization_ml_not_deleted_view"
 #     "description"
 
 
-class OrganizationsLocal(GenericCRUDML, metaclass=MetaLogger,
-                         object=ORGANIZATIONS_PYTHON_PACKAGE_CODE_LOGGER_OBJECT):
+class OrganizationsLocal(
+    GenericCRUDML,
+    metaclass=MetaLogger,
+    object=ORGANIZATIONS_PYTHON_PACKAGE_CODE_LOGGER_OBJECT,
+):
     def __init__(self, is_test_data=False) -> None:
-        GenericCRUDML.__init__(self, default_schema_name=DEFAULT_SCHEMA_NAME,
-                               default_table_name=DEFAULT_TABLE_NAME,
-                               default_column_name=DEFAULT_ID_COLUMN_NAME,
-                               is_test_data=is_test_data)
+        GenericCRUDML.__init__(
+            self,
+            default_schema_name=DEFAULT_SCHEMA_NAME,
+            default_table_name=DEFAULT_TABLE_NAME,
+            default_column_name=DEFAULT_ID_COLUMN_NAME,
+            is_test_data=is_test_data,
+        )
         self.default_view_table_name = DEFAULT_VIEW_NAME
 
     @staticmethod
     def _clean_organization_dict(organization_dict: dict) -> dict:
-        columns = ("name", "is_approved", "is_main", "point", "location_id", "profile_id", "parent_organization_id",
-                   "non_members_visibility_scope_id", "members_visibility_scope_id",
-                   "Non_members_visibility_profile_id", "main_group_id")
+        columns = (
+            "name",
+            "is_approved",
+            "is_main",
+            "point",
+            "location_id",
+            "profile_id",
+            "parent_organization_id",
+            "non_members_visibility_scope_id",
+            "members_visibility_scope_id",
+            "Non_members_visibility_profile_id",
+            "main_group_id",
+        )
         organization_dict = {key: organization_dict.get(key) for key in columns}
         return organization_dict
 
     @staticmethod
     def _clean_organization_ml_dict(organization_dict: dict) -> dict:
-        columns = ("lang_code", "is_main", "title", "is_title_approved",
-                   "is_description_approved", "description")
+        columns = (
+            "lang_code",
+            "is_main",
+            "title",
+            "is_title_approved",
+            "is_description_approved",
+            "description",
+        )
         organization_ml_dict = {key: organization_dict.get(key) for key in columns}
         return organization_ml_dict
 
@@ -89,130 +111,201 @@ class OrganizationsLocal(GenericCRUDML, metaclass=MetaLogger,
         organization_dict = self._clean_organization_dict(organization_dict)
         organization_id = GenericCRUDML.insert(self, data_dict=organization_dict)
         organization_ml_data_dict["organization_id"] = organization_id
-        organization_ml_id = GenericCRUDML.insert(self, table_name="organization_ml_table",
-                                                  data_dict=organization_ml_data_dict)
+        organization_ml_id = GenericCRUDML.insert(
+            self,
+            table_name="organization_ml_table",
+            data_dict=organization_ml_data_dict,
+        )
 
         return organization_id, organization_ml_id
 
-    def upsert_organization(self, organization_dict: dict, order_by: str = None) -> dict:
-        lang_code = LangCode.detect_lang_code_restricted(text=organization_dict.get('title'),
-                                                         #TODO the lang code can be in the organization_dict or in the UserContext, I'm not sure English as default is correct
-                                                         default_lang_code=LangCode.ENGLISH)
+    def upsert_organization(
+        self, organization_dict: dict, order_by: str = None
+    ) -> dict:
+        lang_code = LangCode.detect_lang_code_restricted(
+            text=organization_dict.get("title"),
+            # TODO the lang code can be in the organization_dict or in the UserContext, I'm not sure English as default is correct
+            default_lang_code=LangCode.ENGLISH,
+        )
         organization_ml_dict = self._clean_organization_ml_dict(organization_dict)
         organization_dict = self._clean_organization_dict(organization_dict)
 
-        # TODO Why do we need to do this if outside of GenericCrud in every entity, can we move this "if" into the Generic Crud method? Can we avoid two methods? The parameters of the two methods are the same?
-        if "(" and ")" in organization_dict.get('title', ''):
-            organization_id, organzation_ml_ids_list = GenericCRUDML.upsert_value_with_abbreviations(
-                self, data_ml_dict=organization_ml_dict, lang_code=lang_code,
-                data_dict=organization_dict, schema_name=DEFAULT_SCHEMA_NAME, table_name=DEFAULT_TABLE_NAME,
-                ml_table_name=DEFAULT_ML_TABLE_NAME, order_by=order_by)
+        # TODO Why do we need to do this if outside of GenericCrud in every entity, can we move this "if" into the Generic Crud method? Can we avoid two methods? The parameters of the two methods are the same?  # noqa
+        if "(" and ")" in organization_dict.get("title", ""):
+            organization_id, organzation_ml_ids_list = (
+                GenericCRUDML.upsert_value_with_abbreviations(
+                    self,
+                    data_ml_dict=organization_ml_dict,
+                    lang_code=lang_code,
+                    data_dict=organization_dict,
+                    schema_name=DEFAULT_SCHEMA_NAME,
+                    table_name=DEFAULT_TABLE_NAME,
+                    ml_table_name=DEFAULT_ML_TABLE_NAME,
+                    order_by=order_by,
+                )
+            )
         else:
             organization_id, organzation_ml_id = GenericCRUDML.upsert_value(
-                self, data_ml_dict=organization_ml_dict, lang_code=lang_code,
-                data_dict=organization_dict, schema_name=DEFAULT_SCHEMA_NAME, table_name=DEFAULT_TABLE_NAME,
-                ml_table_name=DEFAULT_ML_TABLE_NAME, order_by=order_by)
+                self,
+                data_ml_dict=organization_ml_dict,
+                lang_code=lang_code,
+                data_dict=organization_dict,
+                schema_name=DEFAULT_SCHEMA_NAME,
+                table_name=DEFAULT_TABLE_NAME,
+                ml_table_name=DEFAULT_ML_TABLE_NAME,
+                order_by=order_by,
+            )
             organzation_ml_ids_list = [organzation_ml_id]
 
-        #TODO upsert_result_dict
+        # TODO upsert_result_dict
         upsert_information = {
             "organization_id": organization_id,
-            "organization_ml_ids_list": organzation_ml_ids_list
+            "organization_ml_ids_list": organzation_ml_ids_list,
         }
 
         return upsert_information
 
-    def update_organization(self, *, organization_id: int, organization_ml_id: int, organization_dict: dict) -> None:
+    def update_organization(
+        self, *, organization_id: int, organization_ml_id: int, organization_dict: dict
+    ) -> None:
         # TODO: should we have such a method in CRUD ML? Same for delete
         organization_ml_dict = self._clean_organization_ml_dict(organization_dict)
         organization_ml_dict["organization_id"] = organization_id
         organization_dict = self._clean_organization_dict(organization_dict)
-        GenericCRUDML.update_by_column_and_value(self, column_value=organization_id,
-                                                 data_dict=organization_dict)
-        GenericCRUDML.update_by_column_and_value(self, table_name="organization_ml_table",
-                                                 column_value=organization_ml_id, data_dict=organization_ml_dict,
-                                                 column_name="organization_ml_id")
+        GenericCRUDML.update_by_column_and_value(
+            self, column_value=organization_id, data_dict=organization_dict
+        )
+        GenericCRUDML.update_by_column_and_value(
+            self,
+            table_name="organization_ml_table",
+            column_value=organization_ml_id,
+            data_dict=organization_ml_dict,
+            column_name="organization_ml_id",
+        )
 
     def get_organization_dict_by_organization_id(
-            self, *, organization_id: int, organization_ml_id: int = None, view_table_name: str = None) -> dict:
+        self,
+        *,
+        organization_id: int,
+        organization_ml_id: int = None,
+        view_table_name: str = None,
+    ) -> dict:
         view_table_name = view_table_name or self.default_view_table_name
         organization_ml_dict = {}
         if organization_ml_id:
             organization_ml_dict = self.select_one_dict_by_column_and_value(
                 view_table_name="organization_ml_view",
-                column_value=organization_ml_id, column_name="organization_ml_id")
+                column_value=organization_ml_id,
+                column_name="organization_ml_id",
+            )
         organization_dict = self.select_one_dict_by_column_and_value(
             view_table_name=view_table_name,
-            column_value=organization_id, column_name="organization_id")
+            column_value=organization_id,
+            column_name="organization_id",
+        )
 
         return {**organization_dict, **organization_ml_dict}
 
     def get_organizations_names_list_by_organizations_ids(
-            self, *, organizations_ids_list: list[int], lang_codes_list: list[LangCode] = None,
-            view_table_name: str = None) -> list[str]:
+        self,
+        *,
+        organizations_ids_list: list[int],
+        lang_codes_list: list[LangCode] = None,
+        view_table_name: str = None,
+    ) -> list[str]:
         lang_codes_list = lang_codes_list or [LangCode.ENGLISH]
         view_table_name = view_table_name or DEFAULT_ML_VIEW_NAME
         organizations_names_list = []
         for organization_id in organizations_ids_list:
             organization_name_dicts = self.select_multi_dict_by_column_and_value(
-                view_table_name=view_table_name, select_clause_value="title, lang_code",
-                column_name="organization_id", column_value=organization_id)
+                view_table_name=view_table_name,
+                select_clause_value="title, lang_code",
+                column_name="organization_id",
+                column_value=organization_id,
+            )
 
             # filter by lang_codes_list
             # TODO: improve performance
             for lang_code in lang_codes_list:
                 for organization_name_dict in organization_name_dicts:
-                    if organization_name_dict.get('lang_code') == lang_code.value:
-                        organizations_names_list.append(organization_name_dict.get('title'))
+                    if organization_name_dict.get("lang_code") == lang_code.value:
+                        organizations_names_list.append(
+                            organization_name_dict.get("title")
+                        )
 
         return organizations_names_list
 
     # Edited by Tal Goodman on 12.7.24
     def get_organizations_ids_and_names_list_by_organizations_ids(
-            self, *, organizations_ids_list: list[int], lang_codes_list: list[LangCode] = None,
-            view_table_name: str = None) -> list[tuple[int, str]]:
+        self,
+        *,
+        organizations_ids_list: list[int],
+        lang_codes_list: list[LangCode] = None,
+        view_table_name: str = None,
+    ) -> list[tuple[int, str]]:
+        if not organizations_ids_list:
+            return []
+
         lang_codes_list = lang_codes_list or [LangCode.ENGLISH]
         view_table_name = view_table_name or DEFAULT_ML_VIEW_NAME
         organizations_ids_and_names_list = []
         select_clause_value = "organization_id, title"
-        placeholders = ', '.join(['%s'] * len(organizations_ids_list))
+        placeholders = ", ".join(["%s"] * len(organizations_ids_list))
         where_clause_value = f"organization_id in ({placeholders})"
         organizations_ids_and_names_list = self.select_multi_tuple_by_where(
-            view_table_name=view_table_name, select_clause_value=select_clause_value,
-            where=where_clause_value, params=organizations_ids_list
+            view_table_name=view_table_name,
+            select_clause_value=select_clause_value,
+            where=where_clause_value,
+            params=organizations_ids_list,
         )
         return organizations_ids_and_names_list
 
-
-    def delete_by_organization_id(self, organization_id: int, organization_ml_id: int = None) -> None:
+    def delete_by_organization_id(
+        self, organization_id: int, organization_ml_id: int = None
+    ) -> None:
         # Delete from organization_table
-        self.delete_by_column_and_value(table_name="organization_table",
-                                        column_name="organization_id", column_value=organization_id)
+        self.delete_by_column_and_value(
+            table_name="organization_table",
+            column_name="organization_id",
+            column_value=organization_id,
+        )
 
         # Delete from organization_ml_table
         if organization_ml_id:
-            self.delete_by_column_and_value(table_name="organization_ml_table",
-                                            column_name="organization_ml_id", column_value=organization_ml_id)
-
+            self.delete_by_column_and_value(
+                table_name="organization_ml_table",
+                column_name="organization_ml_id",
+                column_value=organization_ml_id,
+            )
 
     def get_test_organization_id(self) -> int:
         test_organization_id = self.get_test_entity_id(
-            entity_name="organization", insert_function=self.insert_organization)
+            entity_name="organization", insert_function=self.insert_organization
+        )
         return test_organization_id
 
-
     # TODO Add support of multiple organizations per contact
     # Was def get_update_status(self, *, last_modified_timestamp: str, main_profile_id: int) -> UpdateStatus:
-    def get_update_status_and_information_list(self, *, last_modified_timestamp: str, main_profile_id: int or None) -> list[dict]:
+    def get_update_status_and_information_list(
+        self, *, last_modified_timestamp: str, main_profile_id: int | None
+    ) -> list[dict]:
         if main_profile_id is None:
-            update_status_and_information_list = [{"update_status": UpdateStatus.UPDATE_CIRCLEZ}]
+            update_status_and_information_list = [
+                {"update_status": UpdateStatus.UPDATE_CIRCLEZ}
+            ]
             return update_status_and_information_list
         sync_conflict_resolution = SyncConflictResolution()
         # TODO: Shall we also check update_timestamp in organization_table to see if the name was changed?
-        update_status_and_information_list: list[dict] = sync_conflict_resolution.get_update_status_and_information_list_by_where(
-            schema_name="organization_profile", view_table_name="organization_profile_view",
-            where="profile_id = %s", params=(main_profile_id,), local_last_modified_column_name="updated_timestamp",
-            remote_last_modified_timestamp=last_modified_timestamp)
+        update_status_and_information_list: list[dict] = (
+            sync_conflict_resolution.get_update_status_and_information_list_by_where(
+                schema_name="organization_profile",
+                view_table_name="organization_profile_view",
+                where="profile_id = %s",
+                params=(main_profile_id,),
+                local_last_modified_column_name="updated_timestamp",
+                remote_last_modified_timestamp=last_modified_timestamp,
+            )
+        )
         # Add organization_names to update_status_and_information_list
         # TODO: Can we use a list of only the updated organization since the last sync?
         organizations_ids_list = []
@@ -221,28 +314,36 @@ class OrganizationsLocal(GenericCRUDML, metaclass=MetaLogger,
             if organization_id is not None:
                 organizations_ids_list.append(organization_id)
 
-        organizations_ids_and_names_list = self.get_organizations_ids_and_names_list_by_organizations_ids(
-            organizations_ids_list=organizations_ids_list,
-            view_table_name="organization_ml_view")
+        organizations_ids_and_names_list = (
+            self.get_organizations_ids_and_names_list_by_organizations_ids(
+                organizations_ids_list=organizations_ids_list,
+                view_table_name="organization_ml_view",
+            )
+        )
 
         # Convert organizations_ids_and_names_list to a dictionary
-        organizations_ids_and_names_dict = {item[0]: item[1] for item in organizations_ids_and_names_list}
+        organizations_ids_and_names_dict = {
+            item[0]: item[1] for item in organizations_ids_and_names_list
+        }
 
         for update_status_and_information in update_status_and_information_list:
             organization_id = update_status_and_information.get("organization_id")
             if organization_id is not None:
-                update_status_and_information["organization_name"] = organizations_ids_and_names_dict.get(organization_id)
-        
-        return update_status_and_information_list
+                update_status_and_information["organization_name"] = (
+                    organizations_ids_and_names_dict.get(organization_id)
+                )
 
+        return update_status_and_information_list
 
-    def get_organization_name_by_organization_identifier(self, organization_identifier: str) -> str or None:
-        organization_name=self.select_one_value_by_column_and_value(
-                                                                    select_clause_value="name",
-                                                                    schema_name="organization",
-                                                                    view_table_name="organization_view",
-                                                                    column_name="identifier",
-                                                                    column_value=organization_identifier,
-                                                                    )
+    def get_organization_name_by_organization_identifier(
+        self, organization_identifier: str
+    ) -> str | None:
+        organization_name = self.select_one_value_by_column_and_value(
+            select_clause_value="name",
+            schema_name="organization",
+            view_table_name="organization_view",
+            column_name="identifier",
+            column_value=organization_identifier,
+        )
 
-        return organization_name
+        return organization_name

{organizations_local-0.0.47 → organizations_local-0.0.48}/organizations_local.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: organizations-local
-Version: 0.0.47
+Version: 0.0.48
 Summary: PyPI Package for Circles organizations-local Python
 Home-page: https://github.com/circles-zone/organizations-local-python-package
 Author: Circles

{organizations_local-0.0.47 → organizations_local-0.0.48}/setup.py

@@ -5,25 +5,25 @@ package_dir = PACKAGE_NAME.replace("-", "_")
 
 setuptools.setup(
     name=PACKAGE_NAME,
-    version='0.0.47',  # https://pypi.org/project/organizations-local/
+    version="0.0.48",  # https://pypi.org/project/organizations-local/
     author="Circles",
     author_email="info@circlez.ai",
     description="PyPI Package for Circles organizations-local Python",
     long_description="PyPI Package for Circles organizations-local Python",
-    long_description_content_type='text/markdown',
+    long_description_content_type="text/markdown",
     url=f"https://github.com/circles-zone/{PACKAGE_NAME}-python-package",
     packages=[package_dir],
-    package_dir={package_dir: f'{package_dir}/src'},
-    package_data={package_dir: ['*.py']},
+    package_dir={package_dir: f"{package_dir}/src"},
+    package_data={package_dir: ["*.py"]},
     classifiers=[
         "Programming Language :: Python :: 3",
         "License :: Other/Proprietary License",
         "Operating System :: OS Independent",
     ],
     install_requires=[
-        'database-mysql-local>=0.0.290',
-        'language-remote>=0.0.20',
-        'location-local>=0.0.8',
-        'user-context-remote>=0.0.58',
+        "database-mysql-local>=0.0.290",
+        "language-remote>=0.0.20",
+        "location-local>=0.0.8",
+        "user-context-remote>=0.0.58",
     ],
 )

organizations_local-0.0.47/organizations_local/src/organizations_constants.py

@@ -1,19 +0,0 @@
-from logger_local.LoggerComponentEnum import LoggerComponentEnum
-
-ORGANIZATIONS_LOCAL_PYTHON_COMPONENT_ID = 286
-ORGANIZATIONS_LOCAL_PYTHON_COMPONENT_NAME = "organization-local-python-package"
-DEVELOPER_EMAIL = "tal.g@circ.zone"
-ORGANIZATIONS_PYTHON_PACKAGE_CODE_LOGGER_OBJECT = {
-    'component_id': ORGANIZATIONS_LOCAL_PYTHON_COMPONENT_ID,
-    'component_name': ORGANIZATIONS_LOCAL_PYTHON_COMPONENT_NAME,
-    'component_category': LoggerComponentEnum.ComponentCategory.Code.value,
-    'developer_email': DEVELOPER_EMAIL
-}
-
-ORGANIZATIONS_PYTHON_PACKAGE_TEST_LOGGER_OBJECT = {
-    'component_id': ORGANIZATIONS_LOCAL_PYTHON_COMPONENT_ID,
-    'component_name': ORGANIZATIONS_LOCAL_PYTHON_COMPONENT_NAME,
-    'component_category': LoggerComponentEnum.ComponentCategory.Unit_Test.value,
-    'testing_framework': LoggerComponentEnum.testingFramework.pytest.value,
-    'developer_email': DEVELOPER_EMAIL
-}