tgshops-integrations 3.8__tar.gz → 4.0__tar.gz

{tgshops_integrations-3.8 → tgshops_integrations-4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tgshops_integrations
-Version: 3.8
+Version: 4.0
 Summary: Library is intended to provide the integration of the external service or CRM system with the TelegramShops/It allows to configure the relationship between NocoDB list of the products used further to display in the shop/As a resultss the products can be synchronized and updated uppon the request.
 Home-page: https://git.the-devs.com/virtual-shops/shop-system/shop-backend-integrations/integration-library/integration-library
 Author: Dimi Latoff

{tgshops_integrations-3.8 → tgshops_integrations-4.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup,find_packages
 
 setup(
     name='tgshops_integrations',
-    version='3.8',
+    version='4.0',
     packages=find_packages(),
     install_requires=[
         # List your library's dependencies here

{tgshops_integrations-3.8 → tgshops_integrations-4.0}/tgshops_integrations/middlewares/gateway.py

@@ -27,7 +27,6 @@ from tgshops_integrations.nocodb_connector.categories_management import Category
 from tgshops_integrations.nocodb_connector.products_management import ProductManager
 from loguru import logger
 
-
 def custom_key_builder(func, *args, **kwargs):
     """
     Key builder function for caching.
@@ -120,7 +119,7 @@ class Gateway(NocodbClient):
         self.products_meta = {product.external_id: product for product in self.actual_products}
 
         for product in external_products:
-            if product.external_id in self.ids_mapping:
+            if (product.external_id in self.ids_mapping and product.external_id !=''):
                 product.id = self.ids_mapping[product.external_id]
                 current_hash = self.product_manager.hash_product(product, special_attributes=self.special_attributes)
                 existing_hash = self.product_manager.hash_product(

{tgshops_integrations-3.8 → tgshops_integrations-4.0}/tgshops_integrations/nocodb_connector/categories_management.py

@@ -1,10 +1,10 @@
 from typing import List
 from loguru import logger
 from aiocache import cached
-from tgshops_integrations.models.categories import CategoryModel, CategoryResponseModel, CategoryListResponseModel
-from tgshops_integrations.models.products import ProductModel
-from tgshops_integrations.nocodb_connector.client import custom_key_builder, NocodbClient
-from tgshops_integrations.nocodb_connector.model_mapping import (
+from models.categories import CategoryModel, CategoryResponseModel, CategoryListResponseModel
+from models.products import ProductModel
+from services.nocodb_connector.client import custom_key_builder, NocodbClient
+from services.nocodb_connector.model_mapping import (
     CATEGORY_IMAGE_FIELD,
     CATEGORY_NAME_FIELD,
     CATEGORY_PARENT_FIELD,
@@ -83,23 +83,34 @@ class CategoryManager(NocodbClient):
         )
         return [parse_category_data(record) for record in records]
 
-    async def update_categories(self, external_products: List[ProductModel]) -> None:
+    async def update_categories(self, external_products: List[ProductModel],with_properties: bool = False) -> None:
         self.categories = await self.get_product_categories(table_id=self.categories_table, table_name=PRODUCT_NAME_FIELD)
         categories_list = list(self.categories.keys())
         properties_to_create = []
+        parent_id=0
 
-        for product in external_products:
-            for num, product_property in enumerate(product.product_properties[:len(self.filter_buttons)]):
-                if product_property not in categories_list:
-                    # TODO: Needs restructuring
-                    # parent_id = (
-                    #     self.categories[self.filter_buttons[num]]
-                    #     if self.filter_buttons
-                    #     else self.categories[product.category_I_name[0]]
-                    # )
-                    parent_id=0
-                    properties_to_create.append([product_property, parent_id])
-                    categories_list.append(product_property)
+        if with_properties:
+            for product in external_products:
+                for num, product_property in enumerate(product.product_properties[:len(self.filter_buttons)]):
+                    if product_property not in categories_list:
+                        # TODO: Needs restructuring
+                        # parent_id = (
+                        #     self.categories[self.filter_buttons[num]]
+                        #     if self.filter_buttons
+                        #     else self.categories[product.category_I_name[0]]
+                        # )
+                        
+                        properties_to_create.append([product_property, parent_id])
+                        categories_list.append(product_property)
+
+        else:
+            for product in external_products:
+                # for item in product.categories_structure.values():
+                #     if item not in categories_list:
+                for product_property in product.product_properties:
+                        if product_property not in categories_list:
+                            properties_to_create.append([product_property, parent_id])
+                            categories_list.append(product_property)
 
         if properties_to_create:
             properties_to_create.sort(key=lambda x: x[0])
@@ -115,6 +126,8 @@ class CategoryManager(NocodbClient):
                 if self.logging:
                     logger.info(f"New Category: {new_property}")
                 new_id += 1
+                
+        self.categories = await self.get_product_categories(table_id=self.categories_table, table_name=PRODUCT_NAME_FIELD)
 
     async def link_categories(self, parent_id: int, child_id: int):
         metadata = await self.get_table_meta(self.categories_table)

tgshops_integrations-3.8/tgshops_integrations/nocodb_connector/products_management.py → tgshops_integrations-4.0/tgshops_integrations/nocodb_connector/products_management.py.py

@@ -18,7 +18,6 @@ from tgshops_integrations.nocodb_connector.model_mapping import (
     PRODUCT_IMAGES_LOOKUP_FIELD,
 )
 
-
 class ProductManager(NocodbClient):
     def __init__(self, table_id=None, logging=False, NOCODB_HOST=None, NOCODB_API_KEY=None, SOURCE=None):
         super().__init__(NOCODB_HOST=NOCODB_HOST, NOCODB_API_KEY=NOCODB_API_KEY, SOURCE=SOURCE)
@@ -111,7 +110,7 @@ class ProductManager(NocodbClient):
         )
         logger.info(f"Updated product {product.external_id}")
 
-    async def create_product(self, checked_data: dict, product: ProductModel) -> ProductModel:
+    async def create_product(self, checked_data: dict, product: ProductModel,store_images_at_nocodb: bool=True) -> ProductModel:
         """
         Creates a new product in the table.
         """
@@ -125,14 +124,15 @@ class ProductManager(NocodbClient):
 
         checked_data[PRODUCT_IMAGES_LOOKUP_FIELD] = [image['title'] for image in checked_data['Images']]
 
-        for num, item in enumerate(checked_data['Images']):
-            item['url'] = await self.save_image_to_nocodb(
-                source_column_id=self.SOURCE,
-                image_url=item['url'],
-                image_name=item['title'],
-                product_table_name=self.products_table,
-                images_column_id=images_column,
-            )
+        if store_images_at_nocodb:
+            for num, item in enumerate(checked_data['Images']):
+                item['url'] = await self.save_image_to_nocodb(
+                    source_column_id=self.SOURCE,
+                    image_url=item['url'],
+                    image_name=item['title'],
+                    product_table_name=self.products_table,
+                    images_column_id=images_column,
+                )
 
         record = await self.create_table_record(table_name=self.products_table, record=checked_data)
         logger.info(f"Created product {external_id}")

{tgshops_integrations-3.8 → tgshops_integrations-4.0}/tgshops_integrations.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tgshops-integrations
-Version: 3.8
+Version: 4.0
 Summary: Library is intended to provide the integration of the external service or CRM system with the TelegramShops/It allows to configure the relationship between NocoDB list of the products used further to display in the shop/As a resultss the products can be synchronized and updated uppon the request.
 Home-page: https://git.the-devs.com/virtual-shops/shop-system/shop-backend-integrations/integration-library/integration-library
 Author: Dimi Latoff

{tgshops_integrations-3.8 → tgshops_integrations-4.0}/tgshops_integrations.egg-info/SOURCES.txt

@@ -14,5 +14,5 @@ tgshops_integrations/nocodb_connector/__init__.py
 tgshops_integrations/nocodb_connector/categories_management.py
 tgshops_integrations/nocodb_connector/client.py
 tgshops_integrations/nocodb_connector/model_mapping.py
-tgshops_integrations/nocodb_connector/products_management.py
+tgshops_integrations/nocodb_connector/products_management.py.py
 tgshops_integrations/nocodb_connector/tables.py