tgshops-integrations 1.4__py3-none-any.whl → 1.6__py3-none-any.whl

tgshops_integrations/middlewares/gateway.py

@@ -78,7 +78,7 @@ class Gateway(NocodbClient):
         products_table = self.tables_list[self.config.NOCODB_PRODUCTS]
         await self.product_manager.update_attributes(products=external_products)
         # Updates categories if there were a new ones created
-        external_products=await self.category_manager.map_categories(external_products=external_products)
+        # external_products=await self.category_manager.map_categories(external_products=external_products)
         self.product_manager.actual_products=await self.get_all_products()
         # self.product_manager.actual_products = await self.product_manager.get_products_v2(offset=0,limit=200)
 

tgshops_integrations/nocodb_connector/categories.py

@@ -94,26 +94,26 @@ class CategoryManager(NocodbClient):
 
         for product in external_products:
             # Check for new categories
-            # IF some category number exists on external side
-            if product.category:
-                for external_category_id,category_name in zip(product.category,product.category_name):
-                    if category_name not in [*self.categories.keys()]:
-                        new_category= await self.create_product_category(table_id=self.categories_table,category_name=category_name,category_id=external_category_id,table_name=PRODUCT_NAME_FIELD)
-                        if self.logging:
-                            logger.info(f"New Category {new_category}")
-                        self.external_categories[new_category["Id"]]=external_category_id
-                        self.categories=await self.get_product_categories(table_id=self.categories_table, table_name=PRODUCT_NAME_FIELD)
+            # DEPRECATED IF some category number exists on external side
+            # if product.category:
+            #     for external_category_id,category_name in zip(product.category,product.category_name):
+            #         if category_name not in [*self.categories.keys()]:
+            #             new_category= await self.create_product_category(table_id=self.categories_table,category_name=category_name,category_id=external_category_id,table_name=PRODUCT_NAME_FIELD)
+            #             if self.logging:
+            #                 logger.info(f"New Category {new_category}")
+            #             self.external_categories[new_category["Id"]]=external_category_id
+            #             self.categories=await self.get_product_categories(table_id=self.categories_table, table_name=PRODUCT_NAME_FIELD)
             #Else if there is just the name, create the category with new id
-            else:
+            # else:
                 #Needs the buttons to be initialized, can connect items to buttons , which allows filtered acces through the menu
-                for num,category_name in enumerate(product.category_name):
-                    if category_name not in categories_list:
-                        if self.filter_buttons:
-                            parent_id=self.categories[self.filter_buttons[num]]
-                        else:
-                            parent_id=self.categories[product.category_II_name[0]]
-                        categories_to_create.append([category_name,parent_id])
-                        categories_list.append(category_name)
+            for num,category_name in enumerate(product.category_name):
+                if category_name not in categories_list:
+                    if self.filter_buttons:
+                        parent_id=self.categories[self.filter_buttons[num]]
+                    else:
+                        parent_id=self.categories[product.category_II_name[0]]
+                    categories_to_create.append([category_name,parent_id])
+                    categories_list.append(category_name)
 
         if categories_to_create:
             categories_to_create.sort(key=lambda x: x[0]) 

tgshops_integrations/nocodb_connector/client.py

@@ -253,8 +253,12 @@ class NocodbClient:
         source_column_id -ID of source column
         linked_record_id - ID of linked record
         """
-
-        response = requests.get(image_url)
+        try:
+            response = requests.get(image_url)
+        except:
+            logger.info(f"Error with loading image via url - {image_url}")
+            return ""
+        
         if response.status_code == 200:
             file = io.BytesIO(response.content)
         else:
@@ -263,26 +267,12 @@ class NocodbClient:
         file_size = file.getbuffer().nbytes
 
         if file_size:
-
             files = {'file': (image_name, file, 'image/jpeg')}
-
             url = f"{self.NOCODB_HOST.replace('/api/v2', '/api/v1')}/db/storage/upload?path=noco/{source_column_id}/{product_table_name}/{images_column_id}"
-            timeout = httpx.Timeout(200.0)
-            try:
-                # First attempt
-                response = await self.httpx_client.post(url, files=files, headers=self.httpx_client.headers, timeout=timeout)
-                if response.status_code == 200:
-                    return response.json()[0]['url']
-
-                # If first attempt fails, retry once
-                response = await self.httpx_client.post(url, files=files, headers=self.httpx_client.headers, timeout=timeout)
-                if response.status_code == 200:
-                    return response.json()[0]['url']
-
-            except httpx.HTTPStatusError as e:
-                raise Exception(f"HTTP error occurred: {e}")
-            except Exception as e:
-                raise Exception(f"Request failed: {str(e)}")
-
+            timeout = httpx.Timeout(100.0)
+            response = await self.httpx_client.post(url,files=files,headers=self.httpx_client.headers,timeout=timeout)
+            if response.status_code == 200:
+                return response.json()[0]['url']
+            raise Exception(response.text)
         else:
             return ""

tgshops_integrations/nocodb_connector/model_mapping.py

@@ -135,7 +135,7 @@ def dump_product_data_with_check(data: ProductModel, data_check: dict) -> dict:
         PRODUCT_CURRENCY_FIELD: data.currency,
         PRODUCT_STOCK_FIELD: data.stock_qty,
         PRODUCT_CATEGORY_NAME_FIELD:[data.category_name] if data.category_name else None,
-        PRODUCT_CATEGORY_ID_FIELD: [{'Id': data_check[item]} for item in data.category_name] if data.category else None,
+        PRODUCT_CATEGORY_ID_FIELD: [{'Id': data_check[item]} for item in data.category_name] if data.category_name else None,
         PRODUCT_IMAGE_FIELD: preview_url,
         PRODUCT_CHECKOUT_MODE: NOCODB_CHECKOUT_MODES,
         PRODUCT_DISCOUNT_PRICE_FIELD: data.final_price,

{tgshops_integrations-1.4.dist-info → tgshops_integrations-1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tgshops-integrations
-Version: 1.4
+Version: 1.6
 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-1.4.dist-info → tgshops_integrations-1.6.dist-info}/RECORD

@@ -1,16 +1,16 @@
 tgshops_integrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tgshops_integrations/middlewares/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tgshops_integrations/middlewares/gateway.py,sha256=TLHASMEJMky-hYTqU5Q2Dh3C4hIjfAN-l6HoP6PzQpQ,6325
+tgshops_integrations/middlewares/gateway.py,sha256=yyFHGH0MaBk3MMKREe9PxZBmBcFT9MErwavfnmrf1RE,6327
 tgshops_integrations/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tgshops_integrations/models/categories.py,sha256=EG6C8g5dOfXB2MH-vtqH13aqB7_VyOobY2FHpDb-fsY,977
 tgshops_integrations/models/products.py,sha256=i0vP_eJMVCB-W25BCoodIB0AhsMTqYiDO48N-B6Ueo0,1379
 tgshops_integrations/nocodb_connector/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tgshops_integrations/nocodb_connector/categories.py,sha256=YfQQ8UAkOonNZKO-oTH36vODu0eE-ElG-Me2bH5LdEM,9072
-tgshops_integrations/nocodb_connector/client.py,sha256=tBFvF7-vRY4w4sNQhbX-qKuxRYUoqQub8A3qze9qJUU,12012
-tgshops_integrations/nocodb_connector/model_mapping.py,sha256=CeGAwEZLK_NlK_eBTtsH6oRsjo6Z-QxWdC9KnwEhtPw,8770
+tgshops_integrations/nocodb_connector/categories.py,sha256=x9mtXYEEIt6jV1Qzh_hYwKYJjqyuWyopmyeV0V4myUQ,9069
+tgshops_integrations/nocodb_connector/client.py,sha256=qHv14rwad3P9SCH6h3Rj9UhOMGU6qq39jFJX_Ylxb3I,11640
+tgshops_integrations/nocodb_connector/model_mapping.py,sha256=Sk3AzJCThH97dQIlNuQ7HKqycek_6Tq9UCsWR-9N4_4,8775
 tgshops_integrations/nocodb_connector/products.py,sha256=23uXnmznJN6fZw3tZ3a7dJg06LkI2QaNfVhSKochPn4,8677
 tgshops_integrations/nocodb_connector/tables.py,sha256=ha_QXZXd93mht0fR5E1nM0wUpz1ePon-pIdO2HI67l8,356
-tgshops_integrations-1.4.dist-info/METADATA,sha256=Y_zYUtcAbFdeacZOJQEv68te7NT_PWLrNt4ud_YQB0c,2774
-tgshops_integrations-1.4.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-tgshops_integrations-1.4.dist-info/top_level.txt,sha256=HFNtxqDpzmlF4ZLnMiwhbU7pOa_YozxU2zBl0bnUmcY,21
-tgshops_integrations-1.4.dist-info/RECORD,,
+tgshops_integrations-1.6.dist-info/METADATA,sha256=LTzbKnfZ99RXRkxr8ydi0Arl5-UEXIyAvJS5LzMplD4,2774
+tgshops_integrations-1.6.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+tgshops_integrations-1.6.dist-info/top_level.txt,sha256=HFNtxqDpzmlF4ZLnMiwhbU7pOa_YozxU2zBl0bnUmcY,21
+tgshops_integrations-1.6.dist-info/RECORD,,