Merge pull request #357 from W24-Service-GmbH/werk24/version-2.0

Werk24/version 2.0

requirements.txt

@@ -1,4 +1,4 @@
-aiohttp==3.11.11
+aiohttp==3.11.12
 certifi==2024.12.14
 cryptography>=44.0.0
 packaging>=24.2

werk24/__init__.py

@@ -1,3 +1,3 @@
-from ._version import __version__
-from .models import *
-from .techread import Werk24Client
+from werk24._version import __version__
+from werk24.models import *
+from werk24.techread import Werk24Client as Werk24Client

werk24/cli/werk24.py

@@ -18,7 +18,7 @@
 console = Console()
 logger = get_logger(__name__)
 
-app = typer.Typer(pretty_exceptions_show_locals=False)
+app = typer.Typer(pretty_exceptions_show_locals=False, no_args_is_help=True)
 app.add_typer(init_app)
 app.add_typer(health_check_app)
 app.add_typer(techread_app)

werk24/models/__init__.py

@@ -1,2 +1,53 @@
+from werk24.models.v1 import alignment as alignment
+from werk24.models.v1 import alphabet as alphabet
+from werk24.models.v1 import angle as angle
+from werk24.models.v1 import ask as ask
+from werk24.models.v1 import balloon as balloon
+from werk24.models.v1 import base_feature as base_feature
+from werk24.models.v1 import bend as bend
+from werk24.models.v1 import bom_table as bom_table
+from werk24.models.v1 import chamfer as chamfer
+from werk24.models.v1 import complexity as complexity
+from werk24.models.v1 import date as date
+from werk24.models.v1 import depth as depth
+from werk24.models.v1 import file_format as file_format
+from werk24.models.v1 import font as font
+from werk24.models.v1 import fraction as fraction
+from werk24.models.v1 import gdt as gdt
+from werk24.models.v1 import gender as gender
+from werk24.models.v1 import general_tolerances as general_tolerances
+from werk24.models.v1 import geometric_shape as geometric_shape
+from werk24.models.v1 import helpdesk as helpdesk
+from werk24.models.v1 import hole_feature as hole_feature
+from werk24.models.v1 import icon as icon
+from werk24.models.v1 import language as language
+from werk24.models.v1 import leader as leader
+from werk24.models.v1 import location as location
+from werk24.models.v1 import material as material
+from werk24.models.v1 import measure as measure
+from werk24.models.v1 import note as note
+from werk24.models.v1 import paper_size as paper_size
+from werk24.models.v1 import part_family as part_family
+from werk24.models.v1 import position as position
+from werk24.models.v1 import process as process
+from werk24.models.v1 import projection_method as projection_method
+from werk24.models.v1 import radius as radius
+from werk24.models.v1 import revision_table as revision_table
+from werk24.models.v1 import roughness as roughness
+from werk24.models.v1 import shape as shape
+from werk24.models.v1 import size as size
+from werk24.models.v1 import standard as standard
+from werk24.models.v1 import techread as techread
+from werk24.models.v1 import test_dimension as test_dimension
+from werk24.models.v1 import thread as thread
+from werk24.models.v1 import thread_element as thread_element
+from werk24.models.v1 import title_block as title_block
+from werk24.models.v1 import tolerance as tolerance
+from werk24.models.v1 import typed_model as typed_model
+from werk24.models.v1 import unit as unit
+from werk24.models.v1 import value as value
+from werk24.models.v1 import view as view
+from werk24.models.v1 import weight as weight
+
 from .v1 import *  # noqa: F403
 from .v2 import *  # noqa: F403

werk24/models/v1/ask.py

@@ -1281,11 +1281,21 @@ def _deserialize_ask_type(ask_type: str) -> Type[W24Ask]:
 
 
 W24AskResponse = Union[
-    W24TitleBlock,
     W24AskNotesResponse,
     W24AskPartFamilyCharacterizationResponse,
     W24AskProductPMIExtractResponse,
     W24AskRevisionTableResponse,
+    W24TitleBlock,
+    W24AskVariantExternalDimensionsResponse,
+    W24AskVariantGDTsResponse,
+    W24AskVariantLeadersResponse,
+    W24AskVariantMaterial,
+    W24AskVariantMeasuresResponse,
+    W24AskVariantRadiiResponse,
+    W24AskVariantRoughnessesResponse,
+    W24AskVariantCADResponse,
+    W24AskVariantThreadElementsResponse,
+    W24AskVariantProcessesResponse,
 ]
 
 

werk24/models/v2/__init__.py

@@ -1,5 +1,5 @@
 from .asks import *  # noqa: F403
 from .enums import *  # noqa: F403
+from .internal import *  # noqa: F403
 from .models import *  # noqa: F403
 from .responses import *  # noqa: F403
-from .techread import *  # noqa: F403

werk24/models/v2/techread.py → werk24/models/v2/internal.py

@@ -192,6 +192,7 @@ class TechreadInitResponse(TechreadBaseResponse):
     """
 
     drawing_presigned_post: PresignedPost
+    model_presigned_post: Optional[PresignedPost] = None
     public_key: Optional[str] = None