tgshops-integrations 3.3__tar.gz → 3.5__tar.gz

{tgshops_integrations-3.3 → tgshops_integrations-3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tgshops_integrations
-Version: 3.3
+Version: 3.5
 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.3 → tgshops_integrations-3.5}/setup.py

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

{tgshops_integrations-3.3 → tgshops_integrations-3.5}/tgshops_integrations/middlewares/gateway.py

@@ -9,8 +9,8 @@ from models.products import ProductModel
 import sys
 sys.path.append('/home/latoff/Desktop/MarketBots')
 
-from tgshops_integrations.nocodb_connector.client import NocodbClient
-from tgshops_integrations.nocodb_connector.model_mapping import (
+from nocodb_connector.client import NocodbClient
+from nocodb_connector.model_mapping import (
     dump_product_data,
     dump_product_data_with_check,
     get_pagination_info,
@@ -23,8 +23,8 @@ from tgshops_integrations.nocodb_connector.model_mapping import (
     PRODUCT_IMAGES_LOOKUP_FIELD,
     PRODUCT_EXTERNAL_ID,
 )
-from tgshops_integrations.nocodb_connector.categories_management import CategoryManager
-from tgshops_integrations.nocodb_connector.products_management import ProductManager
+from nocodb_connector.categories_management import CategoryManager
+from nocodb_connector.products_management import ProductManager
 from loguru import logger
 
 

{tgshops_integrations-3.3 → tgshops_integrations-3.5}/tgshops_integrations/models/products.py

@@ -1,5 +1,5 @@
 from pydantic import BaseModel
-from typing import Any, List, Optional
+from typing import Any, List,Dict,Optional
 from datetime import datetime
 
 from pydantic import BaseModel, Field, schema, validator
@@ -10,7 +10,6 @@ class ExtraAttribute(BaseModel):
 
 class ExternalProductModel(BaseModel):
     external_id: str
-
     category: Optional[List[str]]
     category_name: Optional[List[str]]
     name: str
@@ -28,12 +27,12 @@ class ExternalProductModel(BaseModel):
 class ProductModel(BaseModel):
     id: Optional[str]
     external_id: Optional[str]
-    category: Optional[List[int]]
-    category_name: Optional[List[str]]
+    product_properties: Optional[List[str]]
+    categories_structure: Optional[Dict[str, Any]]
     name: str
     description: Optional[str]
     price: Optional[float]
-    final_price: Optional[int]
+    final_price: Optional[float]
     currency: Optional[str]
     stock_qty: int
     orders_qty: int = Field(0, hidden_field=True)

{tgshops_integrations-3.3 → tgshops_integrations-3.5}/tgshops_integrations/nocodb_connector/categories_management.py

@@ -3,8 +3,8 @@ from loguru import logger
 from aiocache import cached
 from models.categories import CategoryModel, CategoryResponseModel, CategoryListResponseModel
 from models.products import ProductModel
-from tgshops_integrations.nocodb_connector.client import custom_key_builder, NocodbClient
-from tgshops_integrations.nocodb_connector.model_mapping import (
+from nocodb_connector.client import custom_key_builder, NocodbClient
+from nocodb_connector.model_mapping import (
     CATEGORY_IMAGE_FIELD,
     CATEGORY_NAME_FIELD,
     CATEGORY_PARENT_FIELD,

{tgshops_integrations-3.3 → tgshops_integrations-3.5}/tgshops_integrations/nocodb_connector/model_mapping.py

@@ -3,8 +3,8 @@ import secrets
 import importlib.util
 from pathlib import Path
 
-from tgshops_integrations.models.categories import CategoryModel, CategoryResponseModel, PaginationResponseModel
-from tgshops_integrations.models.products import ExtraAttribute, ProductModel
+from models.categories import CategoryModel, CategoryResponseModel, PaginationResponseModel
+from models.products import ExtraAttribute, ProductModel
 
 
 # Helper function to load `config.py` dynamically
@@ -33,7 +33,7 @@ def initialize_model_mapping(config_path: str):
     global PRODUCT_IMAGE_FIELD, PRODUCT_DISCOUNT_PRICE_FIELD, PRODUCT_CATEGORY_ID_LOOKUP_FIELD, PRODUCT_IMAGES_LOOKUP_FIELD
     global PRODUCT_REQUIRED_OPTIONS_FIELD, PRODUCT_CATEGORIES_EXTRA_OPTIONS_FIELD, PRODUCT_CATEGORIES_EXTRA_OPTION_NAMES_FIELD
     global PRODUCT_EXTRA_CHOICE_REQUIRED_FIELD, PRODUCT_ID_FIELD, PRODUCT_EXTERNAL_ID, PRODUCT_CHECKOUT_MODE
-    global NEW_ID_FIELD, NOCODB_CHECKOUT_MODES
+    global NEW_ID_FIELD, NOCODB_CHECKOUT_MODES,PRODUCT_CATEGORY_STRUCTURE
 
     config = load_config(config_path)
 
@@ -50,6 +50,7 @@ def initialize_model_mapping(config_path: str):
     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_STRUCTURE=config.PRODUCT_CATEGORY_STRUCTURE
     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
@@ -187,7 +188,8 @@ async def parse_product_data(data: dict) -> ProductModel:
         currency=data.get(PRODUCT_CURRENCY_FIELD, "RUB"),
         stock_qty=data.get(PRODUCT_STOCK_FIELD, 0),
         preview_url=preview_url,
-        category_name=data.get(PRODUCT_CATEGORY_NAME_FIELD, []),
+        product_properties=data.get(PRODUCT_CATEGORY_NAME_FIELD, []),
+        categories_structure=data.get(PRODUCT_CATEGORY_STRUCTURE, {}),
         category=data.get(PRODUCT_CATEGORY_ID_LOOKUP_FIELD, []),
         extra_attributes=extra_attributes,
         extra_option_choice_required=bool(data.get(PRODUCT_EXTRA_CHOICE_REQUIRED_FIELD, [])),

{tgshops_integrations-3.3 → tgshops_integrations-3.5}/tgshops_integrations/nocodb_connector/products_management.py

@@ -3,8 +3,8 @@ import hashlib
 from aiocache import cached
 from loguru import logger
 from models.products import ProductModel
-from tgshops_integrations.nocodb_connector.client import custom_key_builder, NocodbClient
-from tgshops_integrations.nocodb_connector.model_mapping import (
+from nocodb_connector.client import custom_key_builder, NocodbClient
+from nocodb_connector.model_mapping import (
     dump_product_data,
     dump_product_data_with_check,
     get_pagination_info,
@@ -18,6 +18,7 @@ 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)

{tgshops_integrations-3.3 → tgshops_integrations-3.5}/tgshops_integrations.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tgshops-integrations
-Version: 3.3
+Version: 3.5
 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