tgshops-integrations 1.0__py3-none-any.whl → 1.2__py3-none-any.whl

tgshops_integrations/middlewares/gateway.py

@@ -5,6 +5,7 @@ from pathlib import Path
 from aiocache import cached
 from tgshops_integrations.models.products import ProductModel
 from tgshops_integrations.nocodb_connector.client import NocodbClient
+
 from tgshops_integrations.nocodb_connector.model_mapping import dump_product_data,dump_product_data_with_check, get_pagination_info, ID_FIELD, \
     parse_product_data, PRODUCT_CATEGORY_ID_LOOKUP_FIELD, PRODUCT_NAME_FIELD, PRODUCT_PRICE_FIELD, \
     PRODUCT_STOCK_FIELD
@@ -16,41 +17,35 @@ from tgshops_integrations.nocodb_connector.tables import *
 
 from loguru import logger
 
-# Step 1: Define the path to config.py (one level above)
-config_path = Path(__file__).resolve().parent.parent / '../config.py'
-
-# Step 2: Load config.py dynamically using importlib
-spec = importlib.util.spec_from_file_location("config", config_path)
-config = importlib.util.module_from_spec(spec)
-spec.loader.exec_module(config)
-
-# Step 3: Access variables from config.py
-NOCODB_CATEGORIES = config.NOCODB_CATEGORIES
-NOCODB_PRODUCTS = config.NOCODB_PRODUCTS
-NOCODB_STATUSES = config.NOCODB_STATUSES
-NOCODB_BOT_MESSAGES = config.NOCODB_BOT_MESSAGES
-NOCODB_ORDERS = config.NOCODB_ORDERS
-
 class Gateway(NocodbClient):
 
-    def __init__(self,logging=False,NOCODB_HOST=None,NOCODB_API_KEY=None,SOURCE=None,filter_buttons=[],special_attributes=False):
+    def __init__(self,logging=False,NOCODB_HOST=None,NOCODB_API_KEY=None,SOURCE=None,filter_buttons=[],config_path=None,special_attributes=False):
         super().__init__(NOCODB_HOST=NOCODB_HOST,NOCODB_API_KEY=NOCODB_API_KEY,SOURCE=SOURCE)
-        self.NOCODB_HOST = NOCODB_HOST
-        self.NOCODB_API_KEY = NOCODB_API_KEY
-        self.logging=logging
-        self.required_fields = [PRODUCT_NAME_FIELD, PRODUCT_PRICE_FIELD]
+        if config_path:
+            self.load_config_from_path(config_path)
+
+        self.logging = logging
+        self.required_fields = [self.config.PRODUCT_NAME_FIELD, self.config.PRODUCT_PRICE_FIELD]
         self.projection = []
-        self.special_attributes=special_attributes
-        self.filter_buttons=filter_buttons
+        self.special_attributes = special_attributes
+        self.filter_buttons = filter_buttons
+
+    def load_config_from_path(self,config_path):
+        if config_path.exists():
+            spec = importlib.util.spec_from_file_location("config", config_path)
+            self.config = importlib.util.module_from_spec(spec)
+            spec.loader.exec_module(self.config)
+        else:
+            raise FileNotFoundError(f"Configuration file not found at {config_path}")
 
     async def load_data(self,SOURCE=None):
         self.SOURCE=SOURCE
         await self.get_all_tables()
-        self.category_manager=CategoryManager(table_id=self.tables_list[NOCODB_CATEGORIES],NOCODB_HOST=self.NOCODB_HOST,NOCODB_API_KEY=self.NOCODB_API_KEY,logging=True,filter_buttons=self.filter_buttons)
-        self.product_manager=ProductManager(table_id=self.tables_list[NOCODB_PRODUCTS],NOCODB_HOST=self.NOCODB_HOST,NOCODB_API_KEY=self.NOCODB_API_KEY,logging=True)
+        self.category_manager=CategoryManager(table_id=self.tables_list[self.config.NOCODB_CATEGORIES],NOCODB_HOST=self.NOCODB_HOST,NOCODB_API_KEY=self.NOCODB_API_KEY,logging=True,filter_buttons=self.filter_buttons)
+        self.product_manager=ProductManager(table_id=self.tables_list[self.config.NOCODB_PRODUCTS],NOCODB_HOST=self.NOCODB_HOST,NOCODB_API_KEY=self.NOCODB_API_KEY,logging=True)
 
     async def create_product(self,product: ProductModel) -> ProductModel:
-        products_table = self.tables_list[NOCODB_PRODUCTS]
+        products_table = self.tables_list[self.config.NOCODB_PRODUCTS]
         data = dump_product_data_with_check(data=product ,data_check=self.category_manager.categories)
         # product_json = dump_product_data_with_check(data=product,data_check=self.categories)
         external_id = data.pop("ID")
@@ -80,7 +75,7 @@ class Gateway(NocodbClient):
         return actual_products
     
     async def update_products(self, external_products: List[ProductModel]):
-        products_table = self.tables_list[NOCODB_PRODUCTS]
+        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)
@@ -99,7 +94,7 @@ class Gateway(NocodbClient):
                 await self.create_product(product=product)
         
     async def update_product(self, product: ProductModel):
-        products_table = self.tables_list[NOCODB_PRODUCTS]
+        products_table = self.tables_list[self.config.NOCODB_PRODUCTS]
         data = dump_product_data_with_check(data=product ,data_check=self.category_manager.categories)
 
         await self.update_table_record(
@@ -115,40 +110,8 @@ class Gateway(NocodbClient):
                 return product.id
         return None  # Return None if no product is found with the given name
     
-    async def create_table_column(self, name: str, table_id: Optional[str] = None):
-
-        BEARER_TOKEN = "jpdxJtyfDXdjbvxKAcIij1HA8HGalgalLLXZ46DV"
-        
-        headers = {
-            "Authorization": f"Bearer {BEARER_TOKEN}"
-        }
-        if not table_id:
-            table_id = self.tables_list[NOCODB_PRODUCTS]
-
-        response = await self.httpx_client.post(
-            f"{self.NOCODB_HOST.replace('/api/v2', '/api/v1')}/db/meta/tables/{table_id}/columns",
-            json={
-                "column_name": name,
-                "dt": "character varying",
-                "dtx": "specificType",
-                "ct": "varchar(45)",
-                "clen": 45,
-                "dtxp": "45",
-                "dtxs": "",
-                "altered": 1,
-                "uidt": "SingleLineText",
-                "uip": "",
-                "uicn": "",
-                "title": name
-            },
-            headers=headers
-        )
-        logger.info(response.text())
-
-        return response.json()
-    
     async def delete_all_products(self):  
         items = await self.product_manager.get_products_v2(offset=0,limit=200)
-        products_table = self.tables_list[NOCODB_PRODUCTS]    
+        products_table = self.tables_list[self.config.NOCODB_PRODUCTS]    
         for num,item in enumerate(items):
             await self.delete_table_record(products_table, item.id)

tgshops_integrations/nocodb_connector/client.py

@@ -267,10 +267,22 @@ class NocodbClient:
             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(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)
+            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)}")
+
         else:
             return ""

tgshops_integrations/nocodb_connector/model_mapping.py

@@ -11,41 +11,58 @@ from tgshops_integrations.models.products import  ProductModel
 import importlib.util
 from pathlib import Path
 
-# Step 1: Define the path to config.py (one level above)
-config_path = Path(__file__).resolve().parent.parent / '../config.py'
-
-# Step 2: Load config.py dynamically using importlib
-spec = importlib.util.spec_from_file_location("config", config_path)
-config = importlib.util.module_from_spec(spec)
-spec.loader.exec_module(config)
-
-# Step 3: Load all required constants from config.py
-CATEGORY_IMAGE_FIELD = config.CATEGORY_IMAGE_FIELD
-ID_FIELD = config.ID_FIELD
-CATEGORY_NAME_FIELD = config.CATEGORY_NAME_FIELD
-CATEGORY_PARENT_ID_FIELD = config.CATEGORY_PARENT_ID_FIELD
-CATEGORY_PARENT_FIELD = config.CATEGORY_PARENT_FIELD
-
-PRODUCT_NAME_FIELD = config.PRODUCT_NAME_FIELD
-PRODUCT_DESCRIPTION_FIELD = config.PRODUCT_DESCRIPTION_FIELD
-PRODUCT_PRICE_FIELD = config.PRODUCT_PRICE_FIELD
-PRODUCT_CURRENCY_FIELD = config.PRODUCT_CURRENCY_FIELD
-PRODUCT_STOCK_FIELD = config.PRODUCT_STOCK_FIELD
-PRODUCT_CATEGORY_NAME_FIELD = config.PRODUCT_CATEGORY_NAME_FIELD
-PRODUCT_CATEGORY_ID_FIELD = config.PRODUCT_CATEGORY_ID_FIELD
-PRODUCT_IMAGE_FIELD = config.PRODUCT_IMAGE_FIELD
-PRODUCT_DISCOUNT_PRICE_FIELD = config.PRODUCT_DISCOUNT_PRICE_FIELD
-PRODUCT_CATEGORY_ID_LOOKUP_FIELD = config.PRODUCT_CATEGORY_ID_LOOKUP_FIELD
-PRODUCT_REQUIRED_OPTIONS_FIELD = config.PRODUCT_REQUIRED_OPTIONS_FIELD
-PRODUCT_CATEGORIES_EXTRA_OPTIONS_FIELD = config.PRODUCT_CATEGORIES_EXTRA_OPTIONS_FIELD
-PRODUCT_CATEGORIES_EXTRA_OPTION_NAMES_FIELD = config.PRODUCT_CATEGORIES_EXTRA_OPTION_NAMES_FIELD
-PRODUCT_EXTRA_CHOICE_REQUIRED_FIELD = config.PRODUCT_EXTRA_CHOICE_REQUIRED_FIELD
-PRODUCT_ID_FIELD = config.PRODUCT_ID_FIELD
-PRODUCT_EXTERNAL_ID = config.PRODUCT_EXTERNAL_ID
-PRODUCT_CHECKOUT_MODE = config.PRODUCT_CHECKOUT_MODE
-NEW_ID_FIELD = config.NEW_ID_FIELD
-
-NOCODB_CHECKOUT_MODES = config.NOCODB_CHECKOUT_MODES
+
+# Helper function to load config.py dynamically
+def load_config(config_path):
+    config_path = Path(config_path)
+    if config_path.exists():
+        spec = importlib.util.spec_from_file_location("config", config_path)
+        config = importlib.util.module_from_spec(spec)
+        spec.loader.exec_module(config)
+        return config
+    else:
+        raise FileNotFoundError(f"Configuration file not found at {config_path}")
+
+# Modify this to accept config_path dynamically
+def initialize_model_mapping(config_path):
+    global CATEGORY_IMAGE_FIELD, ID_FIELD, CATEGORY_NAME_FIELD, CATEGORY_PARENT_ID_FIELD, CATEGORY_PARENT_FIELD,CATEGORY_ID_OF_CATEGORY_FIELD
+    global PRODUCT_NAME_FIELD, PRODUCT_DESCRIPTION_FIELD, PRODUCT_PRICE_FIELD, PRODUCT_CURRENCY_FIELD, PRODUCT_STOCK_FIELD
+    global PRODUCT_CATEGORY_NAME_FIELD, PRODUCT_CATEGORY_ID_FIELD, PRODUCT_IMAGE_FIELD, PRODUCT_DISCOUNT_PRICE_FIELD
+    global PRODUCT_CATEGORY_ID_LOOKUP_FIELD, PRODUCT_REQUIRED_OPTIONS_FIELD, PRODUCT_CATEGORIES_EXTRA_OPTIONS_FIELD
+    global PRODUCT_CATEGORIES_EXTRA_OPTION_NAMES_FIELD, PRODUCT_EXTRA_CHOICE_REQUIRED_FIELD, PRODUCT_ID_FIELD
+    global PRODUCT_EXTERNAL_ID, PRODUCT_CHECKOUT_MODE, NEW_ID_FIELD, NOCODB_CHECKOUT_MODES
+    
+    config = load_config(config_path)
+    
+    # Step 3: Load all required constants from config.py
+    CATEGORY_IMAGE_FIELD = config.CATEGORY_IMAGE_FIELD
+    ID_FIELD = config.ID_FIELD
+    CATEGORY_NAME_FIELD = config.CATEGORY_NAME_FIELD
+    CATEGORY_PARENT_ID_FIELD = config.CATEGORY_PARENT_ID_FIELD
+    CATEGORY_PARENT_FIELD = config.CATEGORY_PARENT_FIELD
+    CATEGORY_ID_OF_CATEGORY_FIELD = config.CATEGORY_ID_OF_CATEGORY_FIELD
+
+    PRODUCT_NAME_FIELD = config.PRODUCT_NAME_FIELD
+    PRODUCT_DESCRIPTION_FIELD = config.PRODUCT_DESCRIPTION_FIELD
+    PRODUCT_PRICE_FIELD = config.PRODUCT_PRICE_FIELD
+    PRODUCT_CURRENCY_FIELD = config.PRODUCT_CURRENCY_FIELD
+    PRODUCT_STOCK_FIELD = config.PRODUCT_STOCK_FIELD
+    PRODUCT_CATEGORY_NAME_FIELD = config.PRODUCT_CATEGORY_NAME_FIELD
+    
+    PRODUCT_CATEGORY_ID_FIELD = config.PRODUCT_CATEGORY_ID_FIELD
+    PRODUCT_IMAGE_FIELD = config.PRODUCT_IMAGE_FIELD
+    PRODUCT_DISCOUNT_PRICE_FIELD = config.PRODUCT_DISCOUNT_PRICE_FIELD
+    PRODUCT_CATEGORY_ID_LOOKUP_FIELD = config.PRODUCT_CATEGORY_ID_LOOKUP_FIELD
+    PRODUCT_REQUIRED_OPTIONS_FIELD = config.PRODUCT_REQUIRED_OPTIONS_FIELD
+    PRODUCT_CATEGORIES_EXTRA_OPTIONS_FIELD = config.PRODUCT_CATEGORIES_EXTRA_OPTIONS_FIELD
+    PRODUCT_CATEGORIES_EXTRA_OPTION_NAMES_FIELD = config.PRODUCT_CATEGORIES_EXTRA_OPTION_NAMES_FIELD
+    PRODUCT_EXTRA_CHOICE_REQUIRED_FIELD = config.PRODUCT_EXTRA_CHOICE_REQUIRED_FIELD
+    PRODUCT_ID_FIELD = config.PRODUCT_ID_FIELD
+    PRODUCT_EXTERNAL_ID = config.PRODUCT_EXTERNAL_ID
+    PRODUCT_CHECKOUT_MODE = config.PRODUCT_CHECKOUT_MODE
+    NEW_ID_FIELD = config.NEW_ID_FIELD
+
+    NOCODB_CHECKOUT_MODES = config.NOCODB_CHECKOUT_MODES
 
 
 def get_pagination_info(page_info: dict) -> PaginationResponseModel:

{tgshops_integrations-1.0.dist-info → tgshops_integrations-1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tgshops-integrations
-Version: 1.0
+Version: 1.2
 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.0.dist-info → tgshops_integrations-1.2.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=GxXs-lVtrdWq3WTh_j0Hi1ffGsIOCCKJfOu3eyiRI2g,7441
+tgshops_integrations/middlewares/gateway.py,sha256=TLHASMEJMky-hYTqU5Q2Dh3C4hIjfAN-l6HoP6PzQpQ,6325
 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=MD08P25jYWg0ZoLGk9cZ7cH8WJ6vtMn9oXW1N0LuyZ0,11504
-tgshops_integrations/nocodb_connector/model_mapping.py,sha256=xLmfHGZBM4aEf2ZxVuitx5ckXQFSF9VpYms6qy2ao8Y,7653
+tgshops_integrations/nocodb_connector/client.py,sha256=FWEWSL5uxZJIIP8gNcfZT3KyBh1CLm9lsAElD93iyCU,12063
+tgshops_integrations/nocodb_connector/model_mapping.py,sha256=CeGAwEZLK_NlK_eBTtsH6oRsjo6Z-QxWdC9KnwEhtPw,8770
 tgshops_integrations/nocodb_connector/products.py,sha256=23uXnmznJN6fZw3tZ3a7dJg06LkI2QaNfVhSKochPn4,8677
 tgshops_integrations/nocodb_connector/tables.py,sha256=ha_QXZXd93mht0fR5E1nM0wUpz1ePon-pIdO2HI67l8,356
-tgshops_integrations-1.0.dist-info/METADATA,sha256=7D9nxdGywF15S1rf_XBFr3DKX3skyvq_P9O-EQ1oeyo,2774
-tgshops_integrations-1.0.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-tgshops_integrations-1.0.dist-info/top_level.txt,sha256=HFNtxqDpzmlF4ZLnMiwhbU7pOa_YozxU2zBl0bnUmcY,21
-tgshops_integrations-1.0.dist-info/RECORD,,
+tgshops_integrations-1.2.dist-info/METADATA,sha256=3PxRU6u73rR4bA2IzvCjKHV5UCEXEA02_J1fOL-46i4,2774
+tgshops_integrations-1.2.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+tgshops_integrations-1.2.dist-info/top_level.txt,sha256=HFNtxqDpzmlF4ZLnMiwhbU7pOa_YozxU2zBl0bnUmcY,21
+tgshops_integrations-1.2.dist-info/RECORD,,