update models

Author: msfrisbie

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "t3api"
-version = "0.4.0"
+version = "0.5.0"
 description = "Python client for the T3 API"
 authors = [{ name = "Matt Frisbie", email = "[email protected]" }]
 readme = "README.md"

t3api/models/metrc_package.py

@@ -20,6 +20,7 @@
 from datetime import datetime
 from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictFloat, StrictInt, StrictStr, field_validator
 from typing import Any, ClassVar, Dict, List, Optional, Union
+from t3api.models.lab_testing_states import LabTestingStates
 from t3api.models.metrc_item import MetrcItem
 from t3api.models.unit_of_measure_abbreviation import UnitOfMeasureAbbreviation
 from typing import Optional, Set
@@ -42,7 +43,7 @@ class MetrcPackage(BaseModel):
     facility_license_number: Optional[StrictStr] = Field(default=None, description="The license number of the facility associated with the package.", alias="facilityLicenseNumber")
     facility_name: Optional[StrictStr] = Field(default=None, description="The name of the facility associated with the package.", alias="facilityName")
     finished_date: Optional[datetime] = Field(default=None, description="The date and time when the package was finished, if applicable.", alias="finishedDate")
-    initial_lab_testing_state: Optional[StrictStr] = Field(default=None, description="The initial state of lab testing for the package, such as NotRequired, TestPassed, or NotSubmitted.", alias="initialLabTestingState")
+    initial_lab_testing_state: Optional[LabTestingStates] = Field(default=None, alias="initialLabTestingState")
     is_archived: Optional[StrictBool] = Field(default=None, description="Indicates if the package is archived.", alias="isArchived")
     is_donation: Optional[StrictBool] = Field(default=None, description="Indicates if the package was a donation.", alias="isDonation")
     is_donation_persistent: Optional[StrictBool] = Field(default=None, description="Indicates if the donation status of the package is persistent.", alias="isDonationPersistent")
@@ -131,16 +132,6 @@ def index_validate_enum(cls, value):
             raise ValueError("must be one of enum values ('ACTIVE_PACKAGE', 'ONHOLD_PACKAGE', 'INACTIVE_PACKAGE', 'INTRANSIT_PACKAGE')")
         return value
 
-    @field_validator('initial_lab_testing_state')
-    def initial_lab_testing_state_validate_enum(cls, value):
-        """Validates the enum"""
-        if value is None:
-            return value
-
-        if value not in set(['NotRequired', 'TestPassed', 'NotSubmitted']):
-            raise ValueError("must be one of enum values ('NotRequired', 'TestPassed', 'NotSubmitted')")
-        return value
-
     @field_validator('package_type')
     def package_type_validate_enum(cls, value):
         """Validates the enum"""

t3api/models/metrc_superpackage.py

@@ -20,6 +20,7 @@
 from datetime import datetime
 from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictFloat, StrictInt, StrictStr, field_validator
 from typing import Any, ClassVar, Dict, List, Optional, Union
+from t3api.models.lab_testing_states import LabTestingStates
 from t3api.models.metrc_history import MetrcHistory
 from t3api.models.metrc_item import MetrcItem
 from t3api.models.metrc_package_lab_result_batch import MetrcPackageLabResultBatch
@@ -46,7 +47,7 @@ class MetrcSuperpackage(BaseModel):
     facility_license_number: Optional[StrictStr] = Field(default=None, description="The license number of the facility associated with the package.", alias="facilityLicenseNumber")
     facility_name: Optional[StrictStr] = Field(default=None, description="The name of the facility associated with the package.", alias="facilityName")
     finished_date: Optional[datetime] = Field(default=None, description="The date and time when the package was finished, if applicable.", alias="finishedDate")
-    initial_lab_testing_state: Optional[StrictStr] = Field(default=None, description="The initial state of lab testing for the package, such as NotRequired, TestPassed, or NotSubmitted.", alias="initialLabTestingState")
+    initial_lab_testing_state: Optional[LabTestingStates] = Field(default=None, alias="initialLabTestingState")
     is_archived: Optional[StrictBool] = Field(default=None, description="Indicates if the package is archived.", alias="isArchived")
     is_donation: Optional[StrictBool] = Field(default=None, description="Indicates if the package was a donation.", alias="isDonation")
     is_donation_persistent: Optional[StrictBool] = Field(default=None, description="Indicates if the donation status of the package is persistent.", alias="isDonationPersistent")
@@ -139,16 +140,6 @@ def index_validate_enum(cls, value):
             raise ValueError("must be one of enum values ('ACTIVE_PACKAGE', 'ONHOLD_PACKAGE', 'INACTIVE_PACKAGE', 'INTRANSIT_PACKAGE')")
         return value
 
-    @field_validator('initial_lab_testing_state')
-    def initial_lab_testing_state_validate_enum(cls, value):
-        """Validates the enum"""
-        if value is None:
-            return value
-
-        if value not in set(['NotRequired', 'TestPassed', 'NotSubmitted']):
-            raise ValueError("must be one of enum values ('NotRequired', 'TestPassed', 'NotSubmitted')")
-        return value
-
     @field_validator('package_type')
     def package_type_validate_enum(cls, value):
         """Validates the enum"""

t3api/models/metrc_transferred_package.py

@@ -20,6 +20,7 @@
 from datetime import datetime
 from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt, StrictStr, field_validator
 from typing import Any, ClassVar, Dict, List, Optional, Union
+from t3api.models.lab_testing_states import LabTestingStates
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -43,7 +44,7 @@ class MetrcTransferredPackage(BaseModel):
     product_name: StrictStr = Field(description="Name of the product", alias="productName")
     product_category_name: StrictStr = Field(description="Category name of the product", alias="productCategoryName")
     item_strain_name: StrictStr = Field(description="Strain name of the item", alias="itemStrainName")
-    lab_testing_state_name: StrictStr = Field(description="Lab testing status of the item", alias="labTestingStateName")
+    lab_testing_state_name: LabTestingStates = Field(alias="labTestingStateName")
     shipped_quantity: Union[StrictFloat, StrictInt] = Field(description="Quantity shipped", alias="shippedQuantity")
     shipped_unit_of_measure_abbreviation: StrictStr = Field(description="Unit of measure for the shipped quantity", alias="shippedUnitOfMeasureAbbreviation")
     gross_weight: Union[StrictFloat, StrictInt] = Field(description="Gross weight of the package", alias="grossWeight")
@@ -69,13 +70,6 @@ def index_validate_enum(cls, value):
             raise ValueError("must be one of enum values ('TRANSFERRED_PACKAGE')")
         return value
 
-    @field_validator('lab_testing_state_name')
-    def lab_testing_state_name_validate_enum(cls, value):
-        """Validates the enum"""
-        if value not in set(['TestPassed', 'TestFailed', 'Pending']):
-            raise ValueError("must be one of enum values ('TestPassed', 'TestFailed', 'Pending')")
-        return value
-
     @field_validator('shipment_package_state_name')
     def shipment_package_state_name_validate_enum(cls, value):
         """Validates the enum"""

t3api/models/t3_incoming_transfer_manifest.py

@@ -20,6 +20,7 @@
 from datetime import datetime
 from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictFloat, StrictInt, StrictStr, field_validator
 from typing import Any, ClassVar, Dict, List, Optional, Union
+from t3api.models.lab_testing_states import LabTestingStates
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -129,7 +130,7 @@ class T3IncomingTransferManifest(BaseModel):
     package_product_name: StrictStr = Field(description="Name of the product", alias="package.productName")
     package_product_category_name: StrictStr = Field(description="Category name of the product", alias="package.productCategoryName")
     package_item_strain_name: StrictStr = Field(description="Strain name of the item", alias="package.itemStrainName")
-    package_lab_testing_state_name: StrictStr = Field(description="Lab testing status of the item", alias="package.labTestingStateName")
+    package_lab_testing_state_name: LabTestingStates = Field(alias="package.labTestingStateName")
     package_shipped_quantity: Union[StrictFloat, StrictInt] = Field(description="Quantity shipped", alias="package.shippedQuantity")
     package_shipped_unit_of_measure_abbreviation: StrictStr = Field(description="Unit of measure for the shipped quantity", alias="package.shippedUnitOfMeasureAbbreviation")
     package_gross_weight: Union[StrictFloat, StrictInt] = Field(description="Gross weight of the package", alias="package.grossWeight")
@@ -174,13 +175,6 @@ def package_index_validate_enum(cls, value):
             raise ValueError("must be one of enum values ('TRANSFERRED_PACKAGE')")
         return value
 
-    @field_validator('package_lab_testing_state_name')
-    def package_lab_testing_state_name_validate_enum(cls, value):
-        """Validates the enum"""
-        if value not in set(['TestPassed', 'TestFailed', 'Pending']):
-            raise ValueError("must be one of enum values ('TestPassed', 'TestFailed', 'Pending')")
-        return value
-
     @field_validator('package_shipment_package_state_name')
     def package_shipment_package_state_name_validate_enum(cls, value):
         """Validates the enum"""

t3api/models/t3_outgoing_transfer_manifest.py

@@ -20,6 +20,7 @@
 from datetime import datetime
 from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictFloat, StrictInt, StrictStr, field_validator
 from typing import Any, ClassVar, Dict, List, Optional, Union
+from t3api.models.lab_testing_states import LabTestingStates
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -178,7 +179,7 @@ class T3OutgoingTransferManifest(BaseModel):
     package_product_name: StrictStr = Field(description="Name of the product", alias="package.productName")
     package_product_category_name: StrictStr = Field(description="Category name of the product", alias="package.productCategoryName")
     package_item_strain_name: StrictStr = Field(description="Strain name of the item", alias="package.itemStrainName")
-    package_lab_testing_state_name: StrictStr = Field(description="Lab testing status of the item", alias="package.labTestingStateName")
+    package_lab_testing_state_name: LabTestingStates = Field(alias="package.labTestingStateName")
     package_shipped_quantity: Union[StrictFloat, StrictInt] = Field(description="Quantity shipped", alias="package.shippedQuantity")
     package_shipped_unit_of_measure_abbreviation: StrictStr = Field(description="Unit of measure for the shipped quantity", alias="package.shippedUnitOfMeasureAbbreviation")
     package_gross_weight: Union[StrictFloat, StrictInt] = Field(description="Gross weight of the package", alias="package.grossWeight")
@@ -243,13 +244,6 @@ def package_index_validate_enum(cls, value):
             raise ValueError("must be one of enum values ('TRANSFERRED_PACKAGE')")
         return value
 
-    @field_validator('package_lab_testing_state_name')
-    def package_lab_testing_state_name_validate_enum(cls, value):
-        """Validates the enum"""
-        if value not in set(['TestPassed', 'TestFailed', 'Pending']):
-            raise ValueError("must be one of enum values ('TestPassed', 'TestFailed', 'Pending')")
-        return value
-
     @field_validator('package_shipment_package_state_name')
     def package_shipment_package_state_name_validate_enum(cls, value):
         """Validates the enum"""