shop_system_models 0.0.1.dev27006__py3-none-any.whl → 0.0.1.dev27337__py3-none-any.whl

shop_system_models/shop_api/shop/request/details.py

@@ -5,33 +5,15 @@ from pydantic import BaseModel, Field
 
 
 
+class NocoDBConfig(BaseModel):
+    nocodb_project_id: Optional[str] = None
+    nocodb_categories_table: Optional[str] = None
+    nocodb_products_table: Optional[str] = None
+    nocodb_orders_table: Optional[str] = None
+    nocodb_status_table: Optional[str] = None
+    nocodb_bot_commands_table: Optional[str] = None
+    nocodb_options_table: Optional[str] = ""
+    nocodb_options_category_table: Optional[str] = ""
+
 
-class ShopDetailsModel(BaseModel):
-    shop_id: str
-    shop_name: str
-    friendly_name: str
-    shop_language: str = "RU"
-    shop_api_url: str = "https://marketplace-api-dev.tg-shops.com"
-    contact_phone: str | None = None
-    contact_email: str
-    orders_chat_id: int
-    orders_history_chat_id: Optional[int] = None
-    search_enabled: Optional[bool] = False
-    warehouse_accounting: bool = False
-    bot_url: str | None = None
-    bot_token: str
-    payment_token: str | None = None
-    placeholder: str
-    order_process: str
-    nocodb_project_id: str
-    nocodb_categories_table: str
-    nocodb_products_table: str
-    nocodb_orders_table: str
-    nocodb_status_table: str
-    nocodb_bot_commands_table: str
-    nocodb_options_table: Optional[str] = None
-    nocodb_options_category_table: Optional[str] = None
-    topic_chat_id: Optional[int] = None
-    premium_expiration_date: Optional[datetime] = None
-    web_app_url: str = ""
 

shop_system_models/shop_api/shop/request/orders.py

@@ -2,86 +2,109 @@ from datetime import datetime
 from typing import Optional, List, Dict, Any, Union
 from pydantic import Field, field_validator, BaseModel
 
-from shop_system_models.shop_api import MetaBaseModel
 from shop_system_models.shop_api.shop.response.baskets import UserBasketResponseModelV2
-from shop_system_models.shop_api.shop.response.products import ProductResponseModel
+from pydantic_core.core_schema import ValidationInfo
+from shop_system_models.consts.country_codes import ISO3166
 
 
-class ExtraFieldPayload(MetaBaseModel):
-    """Model for extra field data in orders."""
+
+class ExtraFieldPayload(BaseModel):
     name: str
     value: str
 
 
 class OrderDeliveryTypeModel(BaseModel):
-    """Model for order delivery details."""
     name: str
-    address: Optional[str] = ""
-    amount: Optional[float] = 0.0
-    extra_fields_payload: Optional[List[ExtraFieldPayload]] = Field(default_factory=lambda: [])
+    address: str | None = ""
+    amount: float | None = 0.0
+    extra_fields_payload: list[ExtraFieldPayload] | None = []
 
 
-class Coordinates(MetaBaseModel):
-    """Geographic coordinates."""
-    latitude: Optional[float] = None
-    longitude: Optional[float] = None
+class Coordinates(BaseModel):
+    latitude: float | None = None
+    longitude: float | None = None
 
 
-class AddressModel(MetaBaseModel):
-    """Address model with optional coordinates."""
-    coordinates: Optional[Coordinates] = None
-    address: Optional[str] = None
+class AddressModel(BaseModel):
+    coordinates: Coordinates | None = None
+    address: str | None = None
 
 
-class ExtraField(MetaBaseModel):
-    """Model for defining extra fields."""
+class ExtraField(BaseModel):
     name: str
     description: str
-    is_required: Optional[bool] = None
+    is_required: bool | None
 
 
-class DeliveryTypeModel(MetaBaseModel):
-    """Delivery type configuration model."""
+class DeliveryTypeModel(BaseModel):
     name: str
     amount: float = 0.0
-    is_address_required: Optional[bool] = False
-    address_hint: Optional[str] = ""
-    extra_fields: List[ExtraField] = Field(default_factory=list)
+    is_address_required: bool | None = False
+    address_hint: str | None = ""
+    extra_fields: list[ExtraField] = []
     is_timepicker_required: bool = False
-    details: Optional[str] = None
-    country: Optional[str] = None
-    country_code: Optional[str] = None  # ISO format, ex.: RU, KZ, BY...
-    city: Optional[str] = None
-    delivery_location: Optional[Coordinates] = None
-    delivery_radius: Optional[int] = None
-    delivery_min_hour: Optional[int] = None
-    delivery_max_hour: Optional[int] = None
-    delivery_minutes_interval: Optional[int] = None
-    delivery_min_day: Optional[int] = None
-    delivery_max_day: Optional[int] = None
-
-
-class BookingOrderModel(MetaBaseModel):
-    """Details for a booking order."""
+    details: str | None = ""
+    country: str | None = ""
+    country_code: str | None = ""  # ISO format, ex.: RU, KZ, BY...
+    city: str | None = ""
+    delivery_location: Coordinates | None = None
+    delivery_radius: int | None = None
+    delivery_min_hour: int | None = None
+    delivery_max_hour: int | None = None
+    delivery_minutes_interval: int | None = None
+    delivery_min_day: int | None = None
+    delivery_max_day: int | None = None
+
+    @field_validator("country_code", mode="before")
+    def set_country_code(cls, value, values: ValidationInfo):
+        country_code_upper = value.upper()
+        if ISO3166.get(country_code_upper):
+            return country_code_upper
+        return "RU"
+
+
+def format_order_number(order_count: int) -> str:
+    return f"#{order_count:04}"
+
+
+"""
+{
+    "user_id": 123,
+    "basket_id": None,
+    "basket": None,
+    "status": "booking_request",
+    "delivery": None,
+    "delivery_date_from": None,
+    "user_contact_number": None,
+    "client_coordinates": None,
+    "comment": "",# НАДО
+    "payment_type_id": # НАДО
+    "preview_url": ''
+    "booking_details": {
+        "booking_id": "123123",
+        "from_date": datetime.now(),
+        "till_date": datetime.now(),
+        "item_id": "123123",
+    }
+}"""
+
+
+class BookingOrderModel(BaseModel):
     booking_id: str
     from_date: datetime
     till_date: datetime
     item_id: str
 
 
-class CreateOrderModel(MetaBaseModel):
-    """Model for creating a new order."""
-    delivery: Optional[OrderDeliveryTypeModel] = None
+class CreateOrderModel(BaseModel):
+    delivery: OrderDeliveryTypeModel | None = None
     delivery_date_from: datetime = Field(default_factory=datetime.now)
-    comment: Optional[str] = None
-    user_contact_number: Optional[str] = None
-    payment_type_id: Optional[str] = None
-    booking_details: Optional[BookingOrderModel] = None
-    preview_url: Optional[str] = ""
-
+    comment: str | None = None
+    user_contact_number: str | None = None
+    payment_type_id: str | None = None
+    booking_details: BookingOrderModel | None = None
+    preview_url: str | None = ""
 
-class ProductsInBasket(ProductResponseModel):
-    count_in_basket: int = 1
 
 class OrderPaymentDetails(BaseModel):
     title: str
@@ -90,21 +113,19 @@ class OrderPaymentDetails(BaseModel):
     link: str
 
 
-# This depends on UserBasketResponseModelV2 which we'll define in a separate file
-# For now, we'll create a placeholder class that can be updated later
 class OrderModel(CreateOrderModel):
-    """Complete order model."""
-    basket: UserBasketResponseModelV2  # This will be implemented in basket models
-    user_id: Optional[str] = None
-    basket_id: Optional[str] = None
-    status: Optional[str] = None
-    client_coordinates: Optional[AddressModel] = None
-    created: datetime = Field(default_factory=datetime.now)
-    updated: datetime = Field(default_factory=datetime.now)
+    basket: UserBasketResponseModelV2
+    user_id: str | None = None
+    basket_id: str | None = None
+    status: str | None = None
+    client_coordinates: AddressModel | None = None
+    created: datetime = datetime.now()
+    updated: datetime = datetime.now()
     order_number: str = "#0001"
-    process_key: Optional[int] = None
-    coupon: Optional[str] = None
+    process_key: int | None = None
+    coupon: str | None = None
     admin_message_id: str | None = None
+
     payment_data: OrderPaymentDetails | None = None
 
 

shop_system_models/shop_api/shop/response/extra_product_options.py

@@ -17,3 +17,4 @@ class ExtraOptionCategoriesResponseModel(MetaBaseModel):
     choice_count: int = 0  # How many options user can select from this category, 0 means no limit
     is_required: bool | None = False  # If true, user must select at least one option from this category
     options: list[ExtraOptionResponseModel] = []
+    metadata = {}

shop_system_models/shop_api/shop/response/products.py

@@ -22,6 +22,7 @@ class ProductResponseModel(BaseProductResponseModel):
     related_products: list["ProductResponseModel"] | None = []
     secret_urls: list[str] = []
     checkout_modes: list[ProductCheckoutModes] = []
+    metadata = {}
 
     @field_validator("checkout_modes")
     def convert_status(cls, value: list[ProductCheckoutModes]):

{shop_system_models-0.0.1.dev27006.dist-info → shop_system_models-0.0.1.dev27337.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: shop_system_models
-Version: 0.0.1.dev27006
+Version: 0.0.1.dev27337
 Summary: Shared model definitions for shop system services
 Author: Pavel Mulin
 Author-email: pavel@tg-shops.com

{shop_system_models-0.0.1.dev27006.dist-info → shop_system_models-0.0.1.dev27337.dist-info}/RECORD

@@ -58,8 +58,8 @@ shop_system_models/shop_api/shop/request/__init__.py,sha256=kFEy1H52PuduvkyKZtFe
 shop_system_models/shop_api/shop/request/baskets.py,sha256=pQsnXoekis2_5aZYmktUa5YAp3vCAv5MNpD1wBTtDsM,1123
 shop_system_models/shop_api/shop/request/categories.py,sha256=Z5BTycKC3rQfBP5GI2s3VpxaGxJ3DstfwmJpgF8EVXw,626
 shop_system_models/shop_api/shop/request/coupons.py,sha256=9TigEAUKie8Rdg38llkQ6oSRl3aWzppJd1FvWEllolI,1537
-shop_system_models/shop_api/shop/request/details.py,sha256=6cWi5jKpLP9gKQkNryCOkuuB_MU6dZTwXnKgTQ6QOkw,1047
-shop_system_models/shop_api/shop/request/orders.py,sha256=D7qJHyLcdimVOJjRkdoMHOS1GKNpMdrIhZr5Usbo70U,4692
+shop_system_models/shop_api/shop/request/details.py,sha256=yn-dLVbyaabp8r0XVgJ5bVh2-tKpoxbAFhuPZ2fZoyQ,519
+shop_system_models/shop_api/shop/request/orders.py,sha256=Q3DRwCYA-qE3TEdns4l320xBRCgnyFyDVYfaP1wNIV4,4601
 shop_system_models/shop_api/shop/request/payment_methods.py,sha256=KnHM0nz9lp3J8vQ36QIra_jEiaF2uEipNnKKYKsFD6g,388
 shop_system_models/shop_api/shop/request/products.py,sha256=LKIxg0OcmD-uGK9DkuCVJzOgqOv3LWmCa2W5c-uX0os,1076
 shop_system_models/shop_api/shop/request/review.py,sha256=jZOaKx2cPymXnd2RjWKnKZZvSHljYDG3VdyPSWAi54o,270
@@ -69,13 +69,13 @@ shop_system_models/shop_api/shop/response/basic.py,sha256=-RzTETvhIaOBR9TGRXGMHz
 shop_system_models/shop_api/shop/response/baskets.py,sha256=Yg2Etwxu-91mpzojO_zI16A2agBD7Bm2mOay1BAH0Bw,860
 shop_system_models/shop_api/shop/response/categories.py,sha256=TCOTNOkFczVjsnUQ_gdTM1JjQVlkav7xce6ZTWWqVOA,851
 shop_system_models/shop_api/shop/response/coupons.py,sha256=bNh4okw0kWBBEPBUyd4h5ZqfXXcdaIUv3ZSYRdsuuYI,433
-shop_system_models/shop_api/shop/response/extra_product_options.py,sha256=YaH4o7fPNwDnkyXABdFXySdx4C3udyFizzqCrvJ4t4c,599
+shop_system_models/shop_api/shop/response/extra_product_options.py,sha256=JlFRMHaAOp7z_U_xtjWmOnXC3mh3WOe9FvxQXr6mLqY,617
 shop_system_models/shop_api/shop/response/initialization_data.py,sha256=F29pCrajXIA-6xdYzqWudnygLGBIrk4wUUHPqbahWpE,884
 shop_system_models/shop_api/shop/response/orders.py,sha256=4Mprkcq_Q8fK2cv4HvMpAkGRimPh3Jf85aZKXfI4Mf8,699
 shop_system_models/shop_api/shop/response/payment_methods.py,sha256=gSb5zU_8LX4x4gtqfC_it1jFxJ7i-XxNNd15ho54VhQ,371
-shop_system_models/shop_api/shop/response/products.py,sha256=_r5ZZwJJe4iYht4yIu266xsm1U_zQeSFkj5P3P6Y9Oo,1275
+shop_system_models/shop_api/shop/response/products.py,sha256=rL93YywEooIwI6WUzAe-VYpLM4axPKWsPd8sIj5xsA0,1293
 shop_system_models/shop_api/shop/response/review.py,sha256=k5jzgS1HinyjbGfR6gnJENB5WufAedsMS77-vZm6fdw,486
 shop_system_models/shop_api/shop/response/users.py,sha256=DdZOTxGxQdxEg1yZi4v4mm8V8O0pV6K7zc6DWylLrMY,141
-shop_system_models-0.0.1.dev27006.dist-info/METADATA,sha256=CbvvR0qRrSdv9KOaANEjzJzydmGzPCXQM15fTKppRuU,978
-shop_system_models-0.0.1.dev27006.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-shop_system_models-0.0.1.dev27006.dist-info/RECORD,,
+shop_system_models-0.0.1.dev27337.dist-info/METADATA,sha256=dP0uuc3PbetEH8BmYCPPGFGOJ6IqJsVcVVDVkfS1W_Q,978
+shop_system_models-0.0.1.dev27337.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+shop_system_models-0.0.1.dev27337.dist-info/RECORD,,