updates to models and label endpoints

Author: msfrisbie

t3api/__init__.py

@@ -142,6 +142,7 @@
 from t3api.models.pagination import Pagination
 from t3api.models.search_response import SearchResponse
 from t3api.models.t3_generate_labels_payload import T3GenerateLabelsPayload
+from t3api.models.t3_generate_labels_payload_deprecated import T3GenerateLabelsPayloadDEPRECATED
 from t3api.models.t3_incoming_transfer_manifest import T3IncomingTransferManifest
 from t3api.models.t3_label_content_data import T3LabelContentData
 from t3api.models.t3_label_content_data_list_response import T3LabelContentDataListResponse
@@ -150,9 +151,11 @@
 from t3api.models.t3_label_content_layout_element_text_resize_strategy import T3LabelContentLayoutElementTextResizeStrategy
 from t3api.models.t3_label_content_layout_element_type import T3LabelContentLayoutElementType
 from t3api.models.t3_label_content_layouts_response import T3LabelContentLayoutsResponse
+from t3api.models.t3_label_template_layout_config import T3LabelTemplateLayoutConfig
 from t3api.models.t3_label_template_layouts_response import T3LabelTemplateLayoutsResponse
 from t3api.models.t3_outgoing_transfer_manifest import T3OutgoingTransferManifest
 from t3api.models.t3_package_labels_payload import T3PackageLabelsPayload
+from t3api.models.t3_package_labels_payload_deprecated import T3PackageLabelsPayloadDEPRECATED
 from t3api.models.unit_of_measure import UnitOfMeasure
 from t3api.models.unit_of_measure_abbreviation import UnitOfMeasureAbbreviation
 from t3api.models.v2_auth_apikey_post_request import V2AuthApikeyPostRequest
@@ -189,6 +192,7 @@
 from t3api.models.v2_items_get200_response import V2ItemsGet200Response
 from t3api.models.v2_items_history_get200_response import V2ItemsHistoryGet200Response
 from t3api.models.v2_items_report_get200_response import V2ItemsReportGet200Response
+from t3api.models.v2_labels_generate_post_request import V2LabelsGeneratePostRequest
 from t3api.models.v2_licenses_get200_response_inner import V2LicensesGet200ResponseInner
 from t3api.models.v2_packages_active_get200_response import V2PackagesActiveGet200Response
 from t3api.models.v2_packages_active_report_get200_response import V2PackagesActiveReportGet200Response

t3api/api/free_api.py

@@ -90,6 +90,7 @@
 from t3api.models.pagination import Pagination
 from t3api.models.search_response import SearchResponse
 from t3api.models.t3_generate_labels_payload import T3GenerateLabelsPayload
+from t3api.models.t3_generate_labels_payload_deprecated import T3GenerateLabelsPayloadDEPRECATED
 from t3api.models.t3_incoming_transfer_manifest import T3IncomingTransferManifest
 from t3api.models.t3_label_content_data import T3LabelContentData
 from t3api.models.t3_label_content_data_list_response import T3LabelContentDataListResponse
@@ -98,9 +99,11 @@
 from t3api.models.t3_label_content_layout_element_text_resize_strategy import T3LabelContentLayoutElementTextResizeStrategy
 from t3api.models.t3_label_content_layout_element_type import T3LabelContentLayoutElementType
 from t3api.models.t3_label_content_layouts_response import T3LabelContentLayoutsResponse
+from t3api.models.t3_label_template_layout_config import T3LabelTemplateLayoutConfig
 from t3api.models.t3_label_template_layouts_response import T3LabelTemplateLayoutsResponse
 from t3api.models.t3_outgoing_transfer_manifest import T3OutgoingTransferManifest
 from t3api.models.t3_package_labels_payload import T3PackageLabelsPayload
+from t3api.models.t3_package_labels_payload_deprecated import T3PackageLabelsPayloadDEPRECATED
 from t3api.models.unit_of_measure import UnitOfMeasure
 from t3api.models.unit_of_measure_abbreviation import UnitOfMeasureAbbreviation
 from t3api.models.v2_auth_apikey_post_request import V2AuthApikeyPostRequest
@@ -137,6 +140,7 @@
 from t3api.models.v2_items_get200_response import V2ItemsGet200Response
 from t3api.models.v2_items_history_get200_response import V2ItemsHistoryGet200Response
 from t3api.models.v2_items_report_get200_response import V2ItemsReportGet200Response
+from t3api.models.v2_labels_generate_post_request import V2LabelsGeneratePostRequest
 from t3api.models.v2_licenses_get200_response_inner import V2LicensesGet200ResponseInner
 from t3api.models.v2_packages_active_get200_response import V2PackagesActiveGet200Response
 from t3api.models.v2_packages_active_report_get200_response import V2PackagesActiveReportGet200Response

t3api/api/labels_api.py

@@ -17,7 +17,7 @@
 import re  # noqa: F401
 import json
 
-from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictStr
+from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictStr, field_validator
 from typing import Any, ClassVar, Dict, List, Optional
 from typing import Optional, Set
 from typing_extensions import Self
@@ -29,9 +29,20 @@ class JWTData(BaseModel):
     auth_mode: Optional[StrictStr] = Field(default=None, alias="authMode")
     credential_key: Optional[StrictStr] = Field(default=None, alias="credentialKey")
     has_t3plus: Optional[StrictBool] = Field(default=None, alias="hasT3plus")
+    t3plus_subscription_tier: Optional[StrictStr] = Field(default=None, alias="t3plusSubscriptionTier")
     username: Optional[StrictStr] = None
     hostname: Optional[StrictStr] = None
-    __properties: ClassVar[List[str]] = ["authMode", "credentialKey", "hasT3plus", "username", "hostname"]
+    __properties: ClassVar[List[str]] = ["authMode", "credentialKey", "hasT3plus", "t3plusSubscriptionTier", "username", "hostname"]
+
+    @field_validator('t3plus_subscription_tier')
+    def t3plus_subscription_tier_validate_enum(cls, value):
+        """Validates the enum"""
+        if value is None:
+            return value
+
+        if value not in set(['manual', 'basic', 'team', 'enterprise', 'unlimited']):
+            raise ValueError("must be one of enum values ('manual', 'basic', 'team', 'enterprise', 'unlimited')")
+        return value
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -72,6 +83,11 @@ def to_dict(self) -> Dict[str, Any]:
             exclude=excluded_fields,
             exclude_none=True,
         )
+        # set to None if t3plus_subscription_tier (nullable) is None
+        # and model_fields_set contains the field
+        if self.t3plus_subscription_tier is None and "t3plus_subscription_tier" in self.model_fields_set:
+            _dict['t3plusSubscriptionTier'] = None
+
         return _dict
 
     @classmethod
@@ -87,6 +103,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
             "authMode": obj.get("authMode"),
             "credentialKey": obj.get("credentialKey"),
             "hasT3plus": obj.get("hasT3plus"),
+            "t3plusSubscriptionTier": obj.get("t3plusSubscriptionTier"),
             "username": obj.get("username"),
             "hostname": obj.get("hostname")
         })

t3api/api/packages_api.py

@@ -62,9 +62,8 @@ class MetrcHarvest(BaseModel):
     finished_date: Optional[datetime] = Field(default=None, description="Date when the harvest was finished", alias="finishedDate")
     is_archived: Optional[StrictBool] = Field(default=None, description="Indicates if the harvest is archived", alias="isArchived")
     archived_date: Optional[datetime] = Field(default=None, description="Date when the harvest was archived", alias="archivedDate")
-    is_on_trip: Optional[StrictBool] = Field(default=None, description="Indicates if the harvest is currently being transported", alias="isOnTrip")
     last_modified: Optional[datetime] = Field(default=None, description="Last modified date of the harvest", alias="lastModified")
-    __properties: ClassVar[List[str]] = ["id", "hostname", "dataModel", "retrievedAt", "licenseNumber", "index", "facilityLicenseNumber", "facilityName", "name", "harvestType", "harvestTypeName", "sourceStrainCount", "sourceStrainNames", "multiStrain", "dryingLocationName", "dryingSublocationName", "dryingLocationTypeName", "patientLicenseNumber", "currentWeight", "totalWasteWeight", "plantCount", "totalWetWeight", "totalRestoredWeight", "packageCount", "totalPackagedWeight", "unitOfWeightId", "unitOfWeightAbbreviation", "labTestingStateName", "labTestingStateDate", "isOnHold", "harvestStartDate", "isFinished", "finishedDate", "isArchived", "archivedDate", "isOnTrip", "lastModified"]
+    __properties: ClassVar[List[str]] = ["id", "hostname", "dataModel", "retrievedAt", "licenseNumber", "index", "facilityLicenseNumber", "facilityName", "name", "harvestType", "harvestTypeName", "sourceStrainCount", "sourceStrainNames", "multiStrain", "dryingLocationName", "dryingSublocationName", "dryingLocationTypeName", "patientLicenseNumber", "currentWeight", "totalWasteWeight", "plantCount", "totalWetWeight", "totalRestoredWeight", "packageCount", "totalPackagedWeight", "unitOfWeightId", "unitOfWeightAbbreviation", "labTestingStateName", "labTestingStateDate", "isOnHold", "harvestStartDate", "isFinished", "finishedDate", "isArchived", "archivedDate", "lastModified"]
 
     @field_validator('index')
     def index_validate_enum(cls, value):
@@ -212,7 +211,6 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
             "finishedDate": obj.get("finishedDate"),
             "isArchived": obj.get("isArchived"),
             "archivedDate": obj.get("archivedDate"),
-            "isOnTrip": obj.get("isOnTrip"),
             "lastModified": obj.get("lastModified")
         })
         return _obj

t3api/api/pdf_api.py

@@ -106,10 +106,8 @@ class MetrcPackage(BaseModel):
     sell_by_date: Optional[datetime] = Field(default=None, description="The sell-by date of the product in the package, if applicable.", alias="sellByDate")
     use_by_date: Optional[datetime] = Field(default=None, description="The use-by date of the product in the package, if applicable.", alias="useByDate")
     lab_test_result_document_file_id: Optional[Union[StrictFloat, StrictInt]] = Field(default=None, description="The file ID of the lab test result document, if available.", alias="labTestResultDocumentFileId")
-    is_on_trip: Optional[StrictBool] = Field(default=None, description="Indicates if the package is part of an ongoing trip.", alias="isOnTrip")
     is_on_retailer_delivery: Optional[StrictBool] = Field(default=None, description="Indicates if the package is on a retailer delivery.", alias="isOnRetailerDelivery")
     package_for_product_destruction: Optional[StrictBool] = Field(default=None, description="Indicates if the package is intended for product destruction.", alias="packageForProductDestruction")
-    trip: Optional[StrictStr] = Field(default=None, description="Information about the trip associated with the package, if applicable.")
     has_partial: Optional[StrictBool] = Field(default=None, description="Indicates if the package has partial status.", alias="hasPartial")
     is_partial: Optional[StrictBool] = Field(default=None, description="Indicates if the package is a partial package.", alias="isPartial")
     in_transit_status: Optional[StrictStr] = Field(default=None, description="The current transit status of the package.", alias="inTransitStatus")
@@ -121,7 +119,7 @@ class MetrcPackage(BaseModel):
     product_label: Optional[StrictStr] = Field(default=None, alias="productLabel")
     lab_test_stage: Optional[StrictStr] = Field(default=None, alias="labTestStage")
     external_id: Optional[Union[StrictFloat, StrictInt]] = Field(default=None, alias="externalId")
-    __properties: ClassVar[List[str]] = ["id", "hostname", "dataModel", "retrievedAt", "licenseNumber", "index", "archivedDate", "containsRemediatedProduct", "donationFacilityLicenseNumber", "donationFacilityName", "facilityLicenseNumber", "facilityName", "finishedDate", "initialLabTestingState", "isArchived", "isDonation", "isDonationPersistent", "isFinished", "isInTransit", "isOnHold", "isProcessValidationTestingSample", "isProductionBatch", "isTestingSample", "isTradeSample", "isTradeSamplePersistent", "item", "itemFromFacilityLicenseNumber", "itemFromFacilityName", "labTestingStateDate", "labTestingStateName", "labTestingRecordedDate", "labTestingPerformedDate", "labTestStageId", "labTestResultExpirationDateTime", "label", "lastModified", "locationName", "sublocationName", "locationTypeName", "multiHarvest", "multiPackage", "multiProductionBatch", "note", "packageType", "packagedByFacilityLicenseNumber", "packagedByFacilityName", "packagedDate", "patientLicenseNumber", "productRequiresRemediation", "productionBatchNumber", "quantity", "receivedDateTime", "receivedFromFacilityLicenseNumber", "receivedFromFacilityName", "receivedFromManifestNumber", "remediationDate", "sourceHarvestNames", "sourcePackageIsDonation", "sourcePackageIsTradeSample", "sourcePackageLabels", "sourceProductionBatchNumbers", "tradeSampleFacilityName", "tradeSampleFacilityLicenseNumber", "transferManifestNumber", "unitOfMeasureAbbreviation", "unitOfMeasureId", "unitOfMeasureQuantityType", "sourceHarvestCount", "sourcePackageCount", "sourceProcessingJobCount", "sourceProcessingJobNumbers", "sourceProcessingJobNames", "multiProcessingJob", "expirationDate", "sellByDate", "useByDate", "labTestResultDocumentFileId", "isOnTrip", "isOnRetailerDelivery", "packageForProductDestruction", "trip", "hasPartial", "isPartial", "inTransitStatus", "processingJobTypeId", "isOnRecall", "decontaminationDate", "containsDecontaminatedProduct", "productRequiresDecontamination", "productLabel", "labTestStage", "externalId"]
+    __properties: ClassVar[List[str]] = ["id", "hostname", "dataModel", "retrievedAt", "licenseNumber", "index", "archivedDate", "containsRemediatedProduct", "donationFacilityLicenseNumber", "donationFacilityName", "facilityLicenseNumber", "facilityName", "finishedDate", "initialLabTestingState", "isArchived", "isDonation", "isDonationPersistent", "isFinished", "isInTransit", "isOnHold", "isProcessValidationTestingSample", "isProductionBatch", "isTestingSample", "isTradeSample", "isTradeSamplePersistent", "item", "itemFromFacilityLicenseNumber", "itemFromFacilityName", "labTestingStateDate", "labTestingStateName", "labTestingRecordedDate", "labTestingPerformedDate", "labTestStageId", "labTestResultExpirationDateTime", "label", "lastModified", "locationName", "sublocationName", "locationTypeName", "multiHarvest", "multiPackage", "multiProductionBatch", "note", "packageType", "packagedByFacilityLicenseNumber", "packagedByFacilityName", "packagedDate", "patientLicenseNumber", "productRequiresRemediation", "productionBatchNumber", "quantity", "receivedDateTime", "receivedFromFacilityLicenseNumber", "receivedFromFacilityName", "receivedFromManifestNumber", "remediationDate", "sourceHarvestNames", "sourcePackageIsDonation", "sourcePackageIsTradeSample", "sourcePackageLabels", "sourceProductionBatchNumbers", "tradeSampleFacilityName", "tradeSampleFacilityLicenseNumber", "transferManifestNumber", "unitOfMeasureAbbreviation", "unitOfMeasureId", "unitOfMeasureQuantityType", "sourceHarvestCount", "sourcePackageCount", "sourceProcessingJobCount", "sourceProcessingJobNumbers", "sourceProcessingJobNames", "multiProcessingJob", "expirationDate", "sellByDate", "useByDate", "labTestResultDocumentFileId", "isOnRetailerDelivery", "packageForProductDestruction", "hasPartial", "isPartial", "inTransitStatus", "processingJobTypeId", "isOnRecall", "decontaminationDate", "containsDecontaminatedProduct", "productRequiresDecontamination", "productLabel", "labTestStage", "externalId"]
 
     @field_validator('index')
     def index_validate_enum(cls, value):
@@ -325,11 +323,6 @@ def to_dict(self) -> Dict[str, Any]:
         if self.package_for_product_destruction is None and "package_for_product_destruction" in self.model_fields_set:
             _dict['packageForProductDestruction'] = None
 
-        # set to None if trip (nullable) is None
-        # and model_fields_set contains the field
-        if self.trip is None and "trip" in self.model_fields_set:
-            _dict['trip'] = None
-
         # set to None if processing_job_type_id (nullable) is None
         # and model_fields_set contains the field
         if self.processing_job_type_id is None and "processing_job_type_id" in self.model_fields_set:
@@ -444,10 +437,8 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
             "sellByDate": obj.get("sellByDate"),
             "useByDate": obj.get("useByDate"),
             "labTestResultDocumentFileId": obj.get("labTestResultDocumentFileId"),
-            "isOnTrip": obj.get("isOnTrip"),
             "isOnRetailerDelivery": obj.get("isOnRetailerDelivery"),
             "packageForProductDestruction": obj.get("packageForProductDestruction"),
-            "trip": obj.get("trip"),
             "hasPartial": obj.get("hasPartial"),
             "isPartial": obj.get("isPartial"),
             "inTransitStatus": obj.get("inTransitStatus"),

t3api/models/__init__.py

@@ -49,15 +49,14 @@ class MetrcPlant(BaseModel):
     patient_license_number: Optional[StrictStr] = Field(default=None, description="License number of the patient, if applicable.", alias="patientLicenseNumber")
     harvest_count: Optional[StrictInt] = Field(default=None, description="Number of times the plant has been harvested.", alias="harvestCount")
     is_on_hold: Optional[StrictBool] = Field(default=None, description="Indicates if the plant is on hold.", alias="isOnHold")
-    is_on_trip: Optional[StrictBool] = Field(default=None, description="Indicates if the plant is on a trip.", alias="isOnTrip")
     planted_date: Optional[date] = Field(default=None, description="Date when the plant was planted.", alias="plantedDate")
     vegetative_date: Optional[date] = Field(default=None, description="Date when the plant entered the vegetative stage.", alias="vegetativeDate")
     flowering_date: Optional[date] = Field(default=None, description="Date when the plant entered the flowering stage.", alias="floweringDate")
     destroyed_date: Optional[date] = Field(default=None, description="Date when the plant was destroyed, if applicable.", alias="destroyedDate")
     destroyed_note: Optional[StrictStr] = Field(default=None, description="Note about the destruction of the plant, if applicable.", alias="destroyedNote")
     destroyed_by_user_name: Optional[StrictStr] = Field(default=None, description="Username of the person who destroyed the plant, if applicable.", alias="destroyedByUserName")
     last_modified: Optional[datetime] = Field(default=None, description="The last time the plant record was modified.", alias="lastModified")
-    __properties: ClassVar[List[str]] = ["id", "hostname", "dataModel", "retrievedAt", "licenseNumber", "index", "label", "stateName", "growthPhaseName", "plantCount", "groupTagTypeMax", "tagTypeMax", "plantBatchName", "plantBatchTypeName", "strainId", "strainName", "locationName", "sublocationName", "locationTypeName", "patientLicenseNumber", "harvestCount", "isOnHold", "isOnTrip", "plantedDate", "vegetativeDate", "floweringDate", "destroyedDate", "destroyedNote", "destroyedByUserName", "lastModified"]
+    __properties: ClassVar[List[str]] = ["id", "hostname", "dataModel", "retrievedAt", "licenseNumber", "index", "label", "stateName", "growthPhaseName", "plantCount", "groupTagTypeMax", "tagTypeMax", "plantBatchName", "plantBatchTypeName", "strainId", "strainName", "locationName", "sublocationName", "locationTypeName", "patientLicenseNumber", "harvestCount", "isOnHold", "plantedDate", "vegetativeDate", "floweringDate", "destroyedDate", "destroyedNote", "destroyedByUserName", "lastModified"]
 
     @field_validator('index')
     def index_validate_enum(cls, value):
@@ -207,7 +206,6 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
             "patientLicenseNumber": obj.get("patientLicenseNumber"),
             "harvestCount": obj.get("harvestCount"),
             "isOnHold": obj.get("isOnHold"),
-            "isOnTrip": obj.get("isOnTrip"),
             "plantedDate": obj.get("plantedDate"),
             "vegetativeDate": obj.get("vegetativeDate"),
             "floweringDate": obj.get("floweringDate"),