pyetp 0.0.39__py3-none-any.whl → 0.0.43__py3-none-any.whl

pyetp/config.py

@@ -4,24 +4,23 @@ from pydantic import AnyUrl, BaseSettings, Field
 
 
 class WebSocketUrl(AnyUrl):
-    allowed_schemes = {'wss', 'ws'}
+    allowed_schemes = {"wss", "ws"}
 
 
 class Settings(BaseSettings):
-
     class Config:
-        env_prefix = ''  # defaults to no prefix, i.e. ""
+        env_prefix = ""  # defaults to no prefix, i.e. ""
         fields = {
-            'redis_dns': {'env': ['redishost', 'redis_host', 'redis_dns']},
-            'redis_password': {'env': ['redis_password', 'redispass']}
+            "redis_dns": {"env": ["redishost", "redis_host", "redis_dns"]},
+            "redis_password": {"env": ["redis_password", "redispass"]},
         }
 
-    application_name: str = Field(default='pyetp')
-    application_version: str = Field(default='0.0.33')
+    application_name: str = Field(default="pyetp")
+    application_version: str = Field(default="0.0.33")
 
-    #dataspace: str = Field(default='demo/pss-data-gateway')
-    etp_url: WebSocketUrl = Field(default='wss://host.com')
-    etp_timeout: float = Field(default=15., description="Timeout in seconds")
+    # dataspace: str = Field(default='demo/pss-data-gateway')
+    etp_url: WebSocketUrl = Field(default="wss://host.com")
+    etp_timeout: float = Field(default=15.0, description="Timeout in seconds")
     data_partition: Optional[str] = None
     MaxWebSocketMessagePayloadSize: int = Field(default=500000000)
 

pyetp/{resqml_objects/__init__.py → resqml_objects.py}

@@ -1,15 +1,11 @@
-from pyetp.resqml_objects.generated import (
-    APIGammaRayMeasure,
-    APIGammaRayUom,
-    APIGravityMeasure,
-    APIGravityUom,
-    APINeutronMeasure,
-    APINeutronUom,
+import warnings
+
+from resqml_objects.v201 import (
+    URL,
     AbsorbedDoseMeasure,
     AbsorbedDoseUom,
     AbstractActivityParameter,
     AbstractBooleanArray,
-    AbstractCRSType,
     AbstractCitedDataObject,
     AbstractColumnLayerGridGeometry,
     AbstractColumnLayerGridRepresentation,
@@ -18,20 +14,21 @@ from pyetp.resqml_objects.generated import (
     AbstractContextualObject,
     AbstractCoordinateOperationType,
     AbstractCoordinateSystemType,
-    AbstractDQ_Element_Type,
-    AbstractDQ_PositionalAccuracy_Type,
-    AbstractDQ_Result_Type,
+    AbstractCRSType,
     AbstractDataObject,
     AbstractDatumType,
     AbstractDoubleArray,
+    AbstractDQ_Element_Type,
+    AbstractDQ_PositionalAccuracy_Type,
+    AbstractDQ_Result_Type,
     AbstractEX_GeographicExtent_Type,
     AbstractFeature,
     AbstractFeatureInterpretation,
-    AbstractGMLType,
     AbstractGeneralConversionType,
     AbstractGeneralDerivedCRSType,
     AbstractGeologicFeature,
     AbstractGeometry,
+    AbstractGMLType,
     AbstractGridGeometry,
     AbstractGridRepresentation,
     AbstractIntegerArray,
@@ -91,6 +88,12 @@ from pyetp.resqml_objects.generated import (
     AngularAccelerationUom,
     AngularVelocityMeasure,
     AngularVelocityUom,
+    APIGammaRayMeasure,
+    APIGammaRayUom,
+    APIGravityMeasure,
+    APIGravityUom,
+    APINeutronMeasure,
+    APINeutronUom,
     AreaMeasure,
     AreaPerAmountOfSubstanceMeasure,
     AreaPerAmountOfSubstanceUom,
@@ -109,14 +112,29 @@ from pyetp.resqml_objects.generated import (
     BinaryContactInterpretationPart,
     BlockedWellboreRepresentation,
     Boolean,
+    Boolean_PropertyType,
     BooleanArrayFromDiscretePropertyArray,
     BooleanArrayFromIndexArray,
     BooleanConstantArray,
     BooleanHdf5Array,
-    Boolean_PropertyType,
     BoundaryFeature,
     BoundaryFeatureInterpretation,
     BoundaryRelation,
+    CapacitanceMeasure,
+    CapacitanceUom,
+    CartesianCS_1,
+    CartesianCSPropertyType,
+    CartesianCSType,
+    CategoricalProperty,
+    CategoricalPropertySeries,
+    CellFluidPhaseUnits,
+    CellOverlap,
+    CellParentWindow,
+    CellShape,
+    CellStratigraphicUnits,
+    CharacterString,
+    CharacterString_PropertyType,
+    ChronostratigraphicRank,
     CI_Address,
     CI_Address_PropertyType,
     CI_Address_Type,
@@ -127,10 +145,10 @@ from pyetp.resqml_objects.generated import (
     CI_Contact_PropertyType,
     CI_Contact_Type,
     CI_Date,
-    CI_DateTypeCode,
-    CI_DateTypeCode_PropertyType,
     CI_Date_PropertyType,
     CI_Date_Type,
+    CI_DateTypeCode,
+    CI_DateTypeCode_PropertyType,
     CI_OnLineFunctionCode,
     CI_OnLineFunctionCode_PropertyType,
     CI_OnlineResource,
@@ -149,22 +167,6 @@ from pyetp.resqml_objects.generated import (
     CI_Telephone,
     CI_Telephone_PropertyType,
     CI_Telephone_Type,
-    CRSPropertyType,
-    CapacitanceMeasure,
-    CapacitanceUom,
-    CartesianCSPropertyType,
-    CartesianCSType,
-    CartesianCS_1,
-    CategoricalProperty,
-    CategoricalPropertySeries,
-    CellFluidPhaseUnits,
-    CellOverlap,
-    CellParentWindow,
-    CellShape,
-    CellStratigraphicUnits,
-    CharacterString,
-    CharacterString_PropertyType,
-    ChronostratigraphicRank,
     Citation,
     CodeListValue_Type,
     CodeType,
@@ -191,18 +193,16 @@ from pyetp.resqml_objects.generated import (
     CoordinateSystemAxis,
     CoordinateSystemAxisPropertyType,
     CoordinateSystemAxisType,
+    CRSPropertyType,
     CustomData,
-    DQ_EvaluationMethodTypeCode,
-    DQ_EvaluationMethodTypeCode_PropertyType,
-    DQ_Result_PropertyType,
     DataObjectParameter,
     DataObjectReference,
     DataTransferSpeedMeasure,
     DataTransferSpeedUom,
     Date,
+    Date_PropertyType,
     DateTime,
     DateTime_PropertyType,
-    Date_PropertyType,
     Definition,
     DefinitionBaseType,
     DefinitionType,
@@ -226,20 +226,16 @@ from pyetp.resqml_objects.generated import (
     DoubleLatticeArray,
     DoubleLookup,
     DoubleTableLookup,
+    DQ_EvaluationMethodTypeCode,
+    DQ_EvaluationMethodTypeCode_PropertyType,
+    DQ_Result_PropertyType,
     DynamicViscosityMeasure,
     DynamicViscosityUom,
-    EX_Extent,
-    EX_Extent_Type,
-    EX_GeographicExtent_PropertyType,
-    EX_TemporalExtent,
-    EX_TemporalExtent_PropertyType,
-    EX_TemporalExtent_Type,
-    EX_VerticalExtent,
-    EX_VerticalExtent_PropertyType,
-    EX_VerticalExtent_Type,
     EarthModelInterpretation,
     EdgePatch,
     Edges,
+    ElectricalResistivityMeasure,
+    ElectricalResistivityUom,
     ElectricChargeMeasure,
     ElectricChargePerAreaMeasure,
     ElectricChargePerAreaUom,
@@ -264,18 +260,16 @@ from pyetp.resqml_objects.generated import (
     ElectricResistancePerLengthMeasure,
     ElectricResistancePerLengthUom,
     ElectricResistanceUom,
-    ElectricalResistivityMeasure,
-    ElectricalResistivityUom,
     ElectromagneticMomentMeasure,
     ElectromagneticMomentUom,
     ElementIdentity,
     ElementIndices,
-    EllipsoidPropertyType,
-    EllipsoidType,
     Ellipsoid_1,
+    EllipsoidalCS_1,
     EllipsoidalCSPropertyType,
     EllipsoidalCSType,
-    EllipsoidalCS_1,
+    EllipsoidPropertyType,
+    EllipsoidType,
     EnergyLengthPerAreaMeasure,
     EnergyLengthPerAreaUom,
     EnergyLengthPerTimeAreaTemperatureMeasure,
@@ -293,6 +287,15 @@ from pyetp.resqml_objects.generated import (
     EnergyPerVolumeUom,
     EnergyUom,
     EpcExternalPartReference,
+    EX_Extent,
+    EX_Extent_Type,
+    EX_GeographicExtent_PropertyType,
+    EX_TemporalExtent,
+    EX_TemporalExtent_PropertyType,
+    EX_TemporalExtent_Type,
+    EX_VerticalExtent,
+    EX_VerticalExtent_PropertyType,
+    EX_VerticalExtent_Type,
     Facet,
     FaultInterpretation,
     FaultThrow,
@@ -328,9 +331,9 @@ from pyetp.resqml_objects.generated import (
     GeodeticCRS,
     GeodeticCRSPropertyType,
     GeodeticCRSType,
+    GeodeticDatum_1,
     GeodeticDatumPropertyType,
     GeodeticDatumType,
-    GeodeticDatum_1,
     GeologicBoundaryKind,
     GeologicUnitComposition,
     GeologicUnitFeature,
@@ -363,10 +366,10 @@ from pyetp.resqml_objects.generated import (
     IdentifiedObjectType,
     IdentityKind,
     IjGaps,
-    IjSplitColumnEdges,
     IjkGridGeometry,
     IjkGridRepresentation,
     IjkParentWindow,
+    IjSplitColumnEdges,
     IlluminanceMeasure,
     IlluminanceUom,
     IndexableElements,
@@ -379,8 +382,8 @@ from pyetp.resqml_objects.generated import (
     IntegerQuantityParameter,
     IntegerRangeArray,
     IntervalGridCells,
-    IntervalStratigraphicUnits,
     Intervals,
+    IntervalStratigraphicUnits,
     IsothermalCompressibilityMeasure,
     IsothermalCompressibilityUom,
     KDirection,
@@ -403,11 +406,11 @@ from pyetp.resqml_objects.generated import (
     LengthUom,
     LightExposureMeasure,
     LightExposureUom,
-    LineRole,
     LinearAccelerationMeasure,
     LinearAccelerationUom,
     LinearThermalExpansionMeasure,
     LinearThermalExpansionUom,
+    LineRole,
     LocalDepth3dCrs,
     LocalGridSet,
     LocalPropertyKind,
@@ -424,9 +427,6 @@ from pyetp.resqml_objects.generated import (
     LuminousFluxUom,
     LuminousIntensityMeasure,
     LuminousIntensityUom,
-    MD_Identifier,
-    MD_Identifier_PropertyType,
-    MD_Identifier_Type,
     MagneticDipoleMomentMeasure,
     MagneticDipoleMomentUom,
     MagneticFieldStrengthMeasure,
@@ -463,6 +463,9 @@ from pyetp.resqml_objects.generated import (
     MassPerVolumePerLengthUom,
     MassPerVolumeUom,
     MassUom,
+    MD_Identifier,
+    MD_Identifier_PropertyType,
+    MD_Identifier_Type,
     MdDatum,
     MdDomain,
     MdReference,
@@ -558,13 +561,13 @@ from pyetp.resqml_objects.generated import (
     PressureTimePerVolumeMeasure,
     PressureTimePerVolumeUom,
     PressureUom,
+    PrimeMeridian_1,
     PrimeMeridianPropertyType,
     PrimeMeridianType,
-    PrimeMeridian_1,
     ProjectedCRS,
-    ProjectedCRSType,
-    ProjectedCrsEpsgCode,
     ProjectedCrs_1,
+    ProjectedCrsEpsgCode,
+    ProjectedCRSType,
     ProjectedUnknownCrs,
     PropertyKind,
     PropertyKindFacet,
@@ -633,9 +636,9 @@ from pyetp.resqml_objects.generated import (
     SolidAngleUom,
     SpecificHeatCapacityMeasure,
     SpecificHeatCapacityUom,
+    SphericalCS_1,
     SphericalCSPropertyType,
     SphericalCSType,
-    SphericalCS_1,
     SplitEdges,
     SplitFaces,
     SplitNodePatch,
@@ -648,22 +651,21 @@ from pyetp.resqml_objects.generated import (
     StratigraphicUnitInterpretationIndex,
     StreamlineFlux,
     StreamlinePolylineSetPatch,
-    StreamlineWellbores,
     StreamlinesFeature,
     StreamlinesRepresentation,
+    StreamlineWellbores,
     StringHdf5Array,
     StringLookup,
     StringOrRefType,
     StringParameter,
     StringTableLookup,
     StructuralOrganizationInterpretation,
-    SubRepresentation,
-    SubRepresentationPatch,
     SubnodeNodeObject,
     SubnodePatch,
     SubnodeTopology,
+    SubRepresentation,
+    SubRepresentationPatch,
     SurfaceRole,
-    TM_Primitive_PropertyType,
     TectonicBoundaryFeature,
     TectonicBoundaryKind,
     TemperatureIntervalMeasure,
@@ -707,15 +709,14 @@ from pyetp.resqml_objects.generated import (
     TimeSeries,
     TimeSeriesParentage,
     TimeSetKind,
-    TimeUom,
     Timestamp,
+    TimeUom,
+    TM_Primitive_PropertyType,
     TrianglePatch,
     TriangulatedSetRepresentation,
     TruncatedIjkGridRepresentation,
     TruncatedUnstructuredColumnLayerGridRepresentation,
     TruncationCellPatch,
-    URL,
-    URL_PropertyType,
     UniformSubnodePatch,
     UnstructuredColumnEdges,
     UnstructuredColumnLayerGridGeometry,
@@ -724,17 +725,18 @@ from pyetp.resqml_objects.generated import (
     UnstructuredGridHingeNodeFaces,
     UnstructuredGridRepresentation,
     UnstructuredSubnodeTopology,
+    URL_PropertyType,
     VariableSubnodePatch,
     VerticalCRS,
+    VerticalCrs_1,
+    VerticalCrsEpsgCode,
     VerticalCRSType,
+    VerticalCS_1,
     VerticalCSPropertyType,
     VerticalCSType,
-    VerticalCS_1,
-    VerticalCrsEpsgCode,
-    VerticalCrs_1,
+    VerticalDatum_1,
     VerticalDatumPropertyType,
     VerticalDatumType,
-    VerticalDatum_1,
     VerticalDirection,
     VerticalUnknownCrs,
     VolumeFlowRatePerVolumeFlowRateMeasure,
@@ -770,11 +772,11 @@ from pyetp.resqml_objects.generated import (
     VolumePerVolumeUom,
     VolumeRegion,
     VolumeShell,
-    VolumeUom,
     VolumetricHeatTransferCoefficientMeasure,
     VolumetricHeatTransferCoefficientUom,
     VolumetricThermalExpansionMeasure,
     VolumetricThermalExpansionUom,
+    VolumeUom,
     WellboreFeature,
     WellboreFrameRepresentation,
     WellboreInterpretation,
@@ -899,6 +901,14 @@ from pyetp.resqml_objects.generated import (
     verticalDatum_2,
 )
 
+warnings.warn(
+    "The 'pyetp.resqml_objects' module is deprecated and will be removed in a future "
+    "version of pyetp. Please import from 'resqml_objects.v201' instead.",
+    DeprecationWarning,
+    stacklevel=2,
+)
+
+
 __all__ = [
     "APIGammaRayMeasure",
     "APIGammaRayUom",

pyetp/types.py

@@ -1,113 +1,150 @@
+import warnings
+
+warnings.warn(
+    "The 'pyetp.types' module is deprecated and will be removed in a future "
+    "version of pyetp. Please import the ETP types directly from 'etyptypes' instead.",
+    DeprecationWarning,
+    stacklevel=2,
+)
+
 
 from etptypes import ETPModel
 from etptypes.energistics.etp.v12.datatypes.any_array import AnyArray
 from etptypes.energistics.etp.v12.datatypes.any_array_type import AnyArrayType
-from etptypes.energistics.etp.v12.datatypes.any_logical_array_type import \
-    AnyLogicalArrayType
-from etptypes.energistics.etp.v12.datatypes.array_of_boolean import \
-    ArrayOfBoolean
-from etptypes.energistics.etp.v12.datatypes.array_of_double import \
-    ArrayOfDouble
+from etptypes.energistics.etp.v12.datatypes.any_logical_array_type import (
+    AnyLogicalArrayType,
+)
+from etptypes.energistics.etp.v12.datatypes.array_of_boolean import ArrayOfBoolean
+from etptypes.energistics.etp.v12.datatypes.array_of_double import ArrayOfDouble
 from etptypes.energistics.etp.v12.datatypes.array_of_float import ArrayOfFloat
 from etptypes.energistics.etp.v12.datatypes.array_of_int import ArrayOfInt
 from etptypes.energistics.etp.v12.datatypes.array_of_long import ArrayOfLong
-from etptypes.energistics.etp.v12.datatypes.data_array_types.data_array import \
-    DataArray
-from etptypes.energistics.etp.v12.datatypes.data_array_types.data_array_identifier import \
-    DataArrayIdentifier
-from etptypes.energistics.etp.v12.datatypes.data_array_types.data_array_metadata import \
-    DataArrayMetadata
+from etptypes.energistics.etp.v12.datatypes.data_array_types.data_array import DataArray
+from etptypes.energistics.etp.v12.datatypes.data_array_types.data_array_identifier import (
+    DataArrayIdentifier,
+)
+from etptypes.energistics.etp.v12.datatypes.data_array_types.data_array_metadata import (
+    DataArrayMetadata,
+)
 from etptypes.energistics.etp.v12.datatypes.data_value import DataValue
 from etptypes.energistics.etp.v12.datatypes.error_info import ErrorInfo
 from etptypes.energistics.etp.v12.datatypes.message_header import MessageHeader
-from etptypes.energistics.etp.v12.datatypes.object.data_object import \
-    DataObject
+from etptypes.energistics.etp.v12.datatypes.object.data_object import DataObject
 from etptypes.energistics.etp.v12.datatypes.object.dataspace import Dataspace
-from etptypes.energistics.etp.v12.datatypes.server_capabilities import \
-    ServerCapabilities
+from etptypes.energistics.etp.v12.datatypes.server_capabilities import (
+    ServerCapabilities,
+)
 from etptypes.energistics.etp.v12.datatypes.uuid import Uuid
-from etptypes.energistics.etp.v12.datatypes.supported_data_object import \
-    SupportedDataObject
-from etptypes.energistics.etp.v12.datatypes.supported_protocol import \
-    SupportedProtocol
+from etptypes.energistics.etp.v12.datatypes.supported_data_object import (
+    SupportedDataObject,
+)
+from etptypes.energistics.etp.v12.datatypes.supported_protocol import SupportedProtocol
 from etptypes.energistics.etp.v12.datatypes.version import Version
 from etptypes.energistics.etp.v12.protocol.core.acknowledge import Acknowledge
 from etptypes.energistics.etp.v12.protocol.core.authorize import Authorize
-from etptypes.energistics.etp.v12.protocol.core.authorize_response import \
-    AuthorizeResponse
-from etptypes.energistics.etp.v12.protocol.core.close_session import \
-    CloseSession
+from etptypes.energistics.etp.v12.protocol.core.authorize_response import (
+    AuthorizeResponse,
+)
+from etptypes.energistics.etp.v12.protocol.core.close_session import CloseSession
 from etptypes.energistics.etp.v12.protocol.core.open_session import OpenSession
-from etptypes.energistics.etp.v12.protocol.core.protocol_exception import \
-    ProtocolException
-from etptypes.energistics.etp.v12.protocol.core.request_session import \
-    RequestSession
-from etptypes.energistics.etp.v12.protocol.transaction.start_transaction import StartTransaction
-from etptypes.energistics.etp.v12.protocol.transaction.commit_transaction import CommitTransaction
-from etptypes.energistics.etp.v12.protocol.transaction.rollback_transaction import RollbackTransaction
-from etptypes.energistics.etp.v12.datatypes.data_array_types.put_data_subarrays_type import \
-    PutDataSubarraysType
-from etptypes.energistics.etp.v12.datatypes.object.relationship_kind import RelationshipKind
+from etptypes.energistics.etp.v12.protocol.core.protocol_exception import (
+    ProtocolException,
+)
+from etptypes.energistics.etp.v12.protocol.core.request_session import RequestSession
+from etptypes.energistics.etp.v12.protocol.transaction.start_transaction import (
+    StartTransaction,
+)
+from etptypes.energistics.etp.v12.protocol.transaction.commit_transaction import (
+    CommitTransaction,
+)
+from etptypes.energistics.etp.v12.protocol.transaction.rollback_transaction import (
+    RollbackTransaction,
+)
+from etptypes.energistics.etp.v12.datatypes.data_array_types.put_data_subarrays_type import (
+    PutDataSubarraysType,
+)
+from etptypes.energistics.etp.v12.datatypes.object.relationship_kind import (
+    RelationshipKind,
+)
 from etptypes.energistics.etp.v12.datatypes.object.context_info import ContextInfo
-from etptypes.energistics.etp.v12.protocol.data_array.put_data_subarrays import \
-    PutDataSubarrays
-from etptypes.energistics.etp.v12.datatypes.object.context_scope_kind import ContextScopeKind
-from etptypes.energistics.etp.v12.protocol.data_array.put_data_subarrays_response import \
-    PutDataSubarraysResponse
-from etptypes.energistics.etp.v12.datatypes.data_array_types.get_data_subarrays_type import \
-    GetDataSubarraysType
-from etptypes.energistics.etp.v12.protocol.data_array.get_data_subarrays import \
-    GetDataSubarrays
-from etptypes.energistics.etp.v12.protocol.data_array.get_data_subarrays_response import \
-    GetDataSubarraysResponse
-from etptypes.energistics.etp.v12.datatypes.data_array_types.put_data_arrays_type import \
-    PutDataArraysType
-from etptypes.energistics.etp.v12.protocol.data_array.put_data_arrays import \
-    PutDataArrays
-from etptypes.energistics.etp.v12.protocol.data_array.put_data_arrays_response import \
-    PutDataArraysResponse
-from etptypes.energistics.etp.v12.protocol.data_array.get_data_arrays import \
-    GetDataArrays
-from etptypes.energistics.etp.v12.protocol.data_array.get_data_arrays_response import \
-    GetDataArraysResponse
-from etptypes.energistics.etp.v12.protocol.data_array.get_data_array_metadata import \
-    GetDataArrayMetadata
-from etptypes.energistics.etp.v12.protocol.data_array.get_data_array_metadata_response import \
-    GetDataArrayMetadataResponse
-from etptypes.energistics.etp.v12.datatypes.data_array_types.put_uninitialized_data_array_type import \
-    PutUninitializedDataArrayType
-from etptypes.energistics.etp.v12.protocol.data_array.put_uninitialized_data_arrays import \
-    PutUninitializedDataArrays
-from etptypes.energistics.etp.v12.protocol.data_array.put_uninitialized_data_arrays_response import \
-    PutUninitializedDataArraysResponse
-from etptypes.energistics.etp.v12.protocol.store.delete_data_objects import \
-    DeleteDataObjects
-from etptypes.energistics.etp.v12.protocol.store.delete_data_objects_response import \
-    DeleteDataObjectsResponse
-from etptypes.energistics.etp.v12.datatypes.object.resource import \
-    Resource
-from etptypes.energistics.etp.v12.protocol.discovery.get_resources import \
-    GetResources
-from etptypes.energistics.etp.v12.protocol.store.put_data_objects import \
-    PutDataObjects
-from etptypes.energistics.etp.v12.protocol.store.put_data_objects_response import \
-    PutDataObjectsResponse
-from etptypes.energistics.etp.v12.protocol.store.get_data_objects import \
-    GetDataObjects
-from etptypes.energistics.etp.v12.protocol.store.get_data_objects_response import \
-    GetDataObjectsResponse
-from etptypes.energistics.etp.v12.protocol.dataspace.delete_dataspaces import \
-    DeleteDataspaces
-from etptypes.energistics.etp.v12.protocol.dataspace.delete_dataspaces_response import \
-    DeleteDataspacesResponse
-from etptypes.energistics.etp.v12.protocol.dataspace.put_dataspaces import \
-    PutDataspaces
-from etptypes.energistics.etp.v12.protocol.dataspace.put_dataspaces_response import \
-    PutDataspacesResponse
-from etptypes.energistics.etp.v12.protocol.core.authorize import \
-    Authorize
-from etptypes.energistics.etp.v12.protocol.core.authorize_response import \
-    AuthorizeResponse
+from etptypes.energistics.etp.v12.protocol.data_array.put_data_subarrays import (
+    PutDataSubarrays,
+)
+from etptypes.energistics.etp.v12.datatypes.object.context_scope_kind import (
+    ContextScopeKind,
+)
+from etptypes.energistics.etp.v12.protocol.data_array.put_data_subarrays_response import (
+    PutDataSubarraysResponse,
+)
+from etptypes.energistics.etp.v12.datatypes.data_array_types.get_data_subarrays_type import (
+    GetDataSubarraysType,
+)
+from etptypes.energistics.etp.v12.protocol.data_array.get_data_subarrays import (
+    GetDataSubarrays,
+)
+from etptypes.energistics.etp.v12.protocol.data_array.get_data_subarrays_response import (
+    GetDataSubarraysResponse,
+)
+from etptypes.energistics.etp.v12.datatypes.data_array_types.put_data_arrays_type import (
+    PutDataArraysType,
+)
+from etptypes.energistics.etp.v12.protocol.data_array.put_data_arrays import (
+    PutDataArrays,
+)
+from etptypes.energistics.etp.v12.protocol.data_array.put_data_arrays_response import (
+    PutDataArraysResponse,
+)
+from etptypes.energistics.etp.v12.protocol.data_array.get_data_arrays import (
+    GetDataArrays,
+)
+from etptypes.energistics.etp.v12.protocol.data_array.get_data_arrays_response import (
+    GetDataArraysResponse,
+)
+from etptypes.energistics.etp.v12.protocol.data_array.get_data_array_metadata import (
+    GetDataArrayMetadata,
+)
+from etptypes.energistics.etp.v12.protocol.data_array.get_data_array_metadata_response import (
+    GetDataArrayMetadataResponse,
+)
+from etptypes.energistics.etp.v12.datatypes.data_array_types.put_uninitialized_data_array_type import (
+    PutUninitializedDataArrayType,
+)
+from etptypes.energistics.etp.v12.protocol.data_array.put_uninitialized_data_arrays import (
+    PutUninitializedDataArrays,
+)
+from etptypes.energistics.etp.v12.protocol.data_array.put_uninitialized_data_arrays_response import (
+    PutUninitializedDataArraysResponse,
+)
+from etptypes.energistics.etp.v12.protocol.store.delete_data_objects import (
+    DeleteDataObjects,
+)
+from etptypes.energistics.etp.v12.protocol.store.delete_data_objects_response import (
+    DeleteDataObjectsResponse,
+)
+from etptypes.energistics.etp.v12.datatypes.object.resource import Resource
+from etptypes.energistics.etp.v12.protocol.discovery.get_resources import GetResources
+from etptypes.energistics.etp.v12.protocol.store.put_data_objects import PutDataObjects
+from etptypes.energistics.etp.v12.protocol.store.put_data_objects_response import (
+    PutDataObjectsResponse,
+)
+from etptypes.energistics.etp.v12.protocol.store.get_data_objects import GetDataObjects
+from etptypes.energistics.etp.v12.protocol.store.get_data_objects_response import (
+    GetDataObjectsResponse,
+)
+from etptypes.energistics.etp.v12.protocol.dataspace.delete_dataspaces import (
+    DeleteDataspaces,
+)
+from etptypes.energistics.etp.v12.protocol.dataspace.delete_dataspaces_response import (
+    DeleteDataspacesResponse,
+)
+from etptypes.energistics.etp.v12.protocol.dataspace.put_dataspaces import PutDataspaces
+from etptypes.energistics.etp.v12.protocol.dataspace.put_dataspaces_response import (
+    PutDataspacesResponse,
+)
+from etptypes.energistics.etp.v12.protocol.core.authorize import Authorize
+from etptypes.energistics.etp.v12.protocol.core.authorize_response import (
+    AuthorizeResponse,
+)
 #
 # NOTE we want to `from etptypes.energistics.etp.v12 import datatypes, protocol` and use this
 # however this not supported with pylance as of yet, hence so many imports are reexported here