wandelbots-api-client 26.2.0.dev60__py3-none-any.whl → 26.2.0.dev62__py3-none-any.whl

wandelbots_api_client/__init__.py

@@ -13,7 +13,7 @@
     Do not edit the class manually.
 """  # noqa: E501
 
-__version__ = "26.2.0.dev60"
+__version__ = "26.2.0.dev62"
 
 from . import models
 from . import api

wandelbots_api_client/api_client.py

@@ -91,7 +91,7 @@ class ApiClient:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Wandelbots-Nova-API-Python-Client/26.2.0.dev60'
+        self.user_agent = 'Wandelbots-Nova-API-Python-Client/26.2.0.dev62'
         self.client_side_validation = configuration.client_side_validation
 
     async def __aenter__(self):

wandelbots_api_client/configuration.py

@@ -511,7 +511,7 @@ class Configuration:
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: 1.3.0 dev\n"\
-               "SDK Package Version: 26.2.0.dev60".\
+               "SDK Package Version: 26.2.0.dev62".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self) -> List[HostSetting]:

wandelbots_api_client/v2/__init__.py

@@ -13,7 +13,7 @@
     Do not edit the class manually.
 """  # noqa: E501
 
-__version__ = "26.2.0.dev60"
+__version__ = "26.2.0.dev62"
 
 from . import models
 from . import api

wandelbots_api_client/v2/api/trajectory_planning_api.py

@@ -24,6 +24,8 @@ from urllib.parse import quote
 
 from pydantic import Field, StrictStr
 from typing_extensions import Annotated
+from wandelbots_api_client.v2.models.merge_trajectories_request import MergeTrajectoriesRequest
+from wandelbots_api_client.v2.models.merge_trajectories_response import MergeTrajectoriesResponse
 from wandelbots_api_client.v2.models.plan_collision_free_request import PlanCollisionFreeRequest
 from wandelbots_api_client.v2.models.plan_collision_free_response import PlanCollisionFreeResponse
 from wandelbots_api_client.v2.models.plan_trajectory_request import PlanTrajectoryRequest
@@ -45,6 +47,300 @@ class TrajectoryPlanningApi:
             api_client = ApiClient.get_default()
         self.api_client = api_client
 
+    @validate_call
+    async def merge_trajectories(
+        self,
+        cell: Annotated[StrictStr, Field(description="Unique identifier addressing a cell in all API calls. ")],
+        merge_trajectories_request: MergeTrajectoriesRequest,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> MergeTrajectoriesResponse:
+        """Merge Trajectories
+
+        <!-- theme: danger -->  > **Experimental**  Merges a list of joint trajectories into a single trajectory with collision-aware blending.  This endpoint merges a list of separate trajectories by connecting them via blending. The blending is performed with collision checking to ensure the merged trajectory is safe to execute. Timescaling will be applied to the blended area to ensure all limits are respected. 
+
+        :param cell: Unique identifier addressing a cell in all API calls.  (required)
+        :type cell: str
+        :param merge_trajectories_request: (required)
+        :type merge_trajectories_request: MergeTrajectoriesRequest
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._merge_trajectories_serialize(
+            cell=cell,
+            merge_trajectories_request=merge_trajectories_request,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "MergeTrajectoriesResponse",
+            '404': None,
+            '422': "MergeTrajectories422Response",
+            '500': None,
+        }
+        response_data = await self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        await response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        ).data
+
+
+    @validate_call
+    async def merge_trajectories_with_http_info(
+        self,
+        cell: Annotated[StrictStr, Field(description="Unique identifier addressing a cell in all API calls. ")],
+        merge_trajectories_request: MergeTrajectoriesRequest,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> ApiResponse[MergeTrajectoriesResponse]:
+        """Merge Trajectories
+
+        <!-- theme: danger -->  > **Experimental**  Merges a list of joint trajectories into a single trajectory with collision-aware blending.  This endpoint merges a list of separate trajectories by connecting them via blending. The blending is performed with collision checking to ensure the merged trajectory is safe to execute. Timescaling will be applied to the blended area to ensure all limits are respected. 
+
+        :param cell: Unique identifier addressing a cell in all API calls.  (required)
+        :type cell: str
+        :param merge_trajectories_request: (required)
+        :type merge_trajectories_request: MergeTrajectoriesRequest
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._merge_trajectories_serialize(
+            cell=cell,
+            merge_trajectories_request=merge_trajectories_request,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "MergeTrajectoriesResponse",
+            '404': None,
+            '422': "MergeTrajectories422Response",
+            '500': None,
+        }
+        response_data = await self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        await response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        )
+
+
+    @validate_call
+    async def merge_trajectories_without_preload_content(
+        self,
+        cell: Annotated[StrictStr, Field(description="Unique identifier addressing a cell in all API calls. ")],
+        merge_trajectories_request: MergeTrajectoriesRequest,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> RESTResponseType:
+        """Merge Trajectories
+
+        <!-- theme: danger -->  > **Experimental**  Merges a list of joint trajectories into a single trajectory with collision-aware blending.  This endpoint merges a list of separate trajectories by connecting them via blending. The blending is performed with collision checking to ensure the merged trajectory is safe to execute. Timescaling will be applied to the blended area to ensure all limits are respected. 
+
+        :param cell: Unique identifier addressing a cell in all API calls.  (required)
+        :type cell: str
+        :param merge_trajectories_request: (required)
+        :type merge_trajectories_request: MergeTrajectoriesRequest
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._merge_trajectories_serialize(
+            cell=cell,
+            merge_trajectories_request=merge_trajectories_request,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "MergeTrajectoriesResponse",
+            '404': None,
+            '422': "MergeTrajectories422Response",
+            '500': None,
+        }
+        response_data = await self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        return response_data.response
+
+
+    def _merge_trajectories_serialize(
+        self,
+        cell,
+        merge_trajectories_request,
+        _request_auth,
+        _content_type,
+        _headers,
+        _host_index,
+    ) -> RequestSerialized:
+
+        _host = None
+
+        _collection_formats: Dict[str, str] = {
+        }
+
+        _path_params: Dict[str, str] = {}
+        _query_params: List[Tuple[str, str]] = []
+        _header_params: Dict[str, Optional[str]] = _headers or {}
+        _form_params: List[Tuple[str, str]] = []
+        _files: Dict[str, Union[str, bytes]] = {}
+        _body_params: Optional[bytes] = None
+
+        # process the path parameters
+        if cell is not None:
+            _path_params['cell'] = cell
+        # process the query parameters
+        # process the header parameters
+        # process the form parameters
+        # process the body parameter
+        if merge_trajectories_request is not None:
+            _body_params = merge_trajectories_request
+
+
+        # set the HTTP header `Accept`
+        _header_params['Accept'] = self.api_client.select_header_accept(
+            [
+                'application/json'
+            ]
+        )
+
+        # set the HTTP header `Content-Type`
+        if _content_type:
+            _header_params['Content-Type'] = _content_type
+        else:
+            _default_content_type = (
+                self.api_client.select_header_content_type(
+                    [
+                        'application/json'
+                    ]
+                )
+            )
+            if _default_content_type is not None:
+                _header_params['Content-Type'] = _default_content_type
+
+        # authentication setting
+        _auth_settings: List[str] = [
+            'BearerAuth'
+        ]
+
+        return self.api_client.param_serialize(
+            method='POST',
+            resource_path='/experimental/cells/{cell}/trajectory-planning/merge-trajectories',
+            path_params=_path_params,
+            query_params=_query_params,
+            header_params=_header_params,
+            body=_body_params,
+            post_params=_form_params,
+            files=_files,
+            auth_settings=_auth_settings,
+            collection_formats=_collection_formats,
+            _host=_host,
+            _request_auth=_request_auth
+        )
+
+
+
     @validate_call
     async def plan_collision_free(
         self,

wandelbots_api_client/v2/api_client.py

@@ -91,7 +91,7 @@ class ApiClient:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Wandelbots-Nova-API-Python-Client/26.2.0.dev60'
+        self.user_agent = 'Wandelbots-Nova-API-Python-Client/26.2.0.dev62'
         self.client_side_validation = configuration.client_side_validation
 
     async def __aenter__(self):

wandelbots_api_client/v2/configuration.py

@@ -511,7 +511,7 @@ class Configuration:
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: 2.2.0 dev\n"\
-               "SDK Package Version: 26.2.0.dev60".\
+               "SDK Package Version: 26.2.0.dev62".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self) -> List[HostSetting]:

wandelbots_api_client/v2/models/__init__.py

@@ -148,6 +148,13 @@ from .limit_set import LimitSet
 from .limits_override import LimitsOverride
 from .list_trajectories_response import ListTrajectoriesResponse
 from .manufacturer import Manufacturer
+from .merge_trajectories422_response import MergeTrajectories422Response
+from .merge_trajectories_error import MergeTrajectoriesError
+from .merge_trajectories_request import MergeTrajectoriesRequest
+from .merge_trajectories_response import MergeTrajectoriesResponse
+from .merge_trajectories_response_feedback_inner import MergeTrajectoriesResponseFeedbackInner
+from .merge_trajectories_segment import MergeTrajectoriesSegment
+from .merge_trajectories_validation_error import MergeTrajectoriesValidationError
 from .midpoint_insertion_algorithm import MidpointInsertionAlgorithm
 from .modbus_io import ModbusIO
 from .modbus_io_area import ModbusIOArea
@@ -254,6 +261,7 @@ from .trajectory_id import TrajectoryId
 from .trajectory_paused_by_user import TrajectoryPausedByUser
 from .trajectory_paused_on_io import TrajectoryPausedOnIO
 from .trajectory_running import TrajectoryRunning
+from .trajectory_section import TrajectorySection
 from .trajectory_wait_for_io import TrajectoryWaitForIO
 from .unit_type import UnitType
 from .universalrobots_controller import UniversalrobotsController
@@ -404,6 +412,13 @@ __all__ = [
     "LimitsOverride", 
     "ListTrajectoriesResponse", 
     "Manufacturer", 
+    "MergeTrajectories422Response", 
+    "MergeTrajectoriesError", 
+    "MergeTrajectoriesRequest", 
+    "MergeTrajectoriesResponse", 
+    "MergeTrajectoriesResponseFeedbackInner", 
+    "MergeTrajectoriesSegment", 
+    "MergeTrajectoriesValidationError", 
     "MidpointInsertionAlgorithm", 
     "ModbusIO", 
     "ModbusIOArea", 
@@ -510,6 +525,7 @@ __all__ = [
     "TrajectoryPausedByUser", 
     "TrajectoryPausedOnIO", 
     "TrajectoryRunning", 
+    "TrajectorySection", 
     "TrajectoryWaitForIO", 
     "UnitType", 
     "UniversalrobotsController", 

wandelbots_api_client/v2/models/merge_trajectories422_response.py

@@ -0,0 +1,108 @@
+# coding: utf-8
+
+"""
+    Wandelbots NOVA API
+
+    Interact with robots in an easy and intuitive way. 
+
+    The version of the OpenAPI document: 2.2.0 dev
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from pydantic import BaseModel, ConfigDict
+from typing import Any, ClassVar, Dict, List, Optional
+from wandelbots_api_client.v2.models.merge_trajectories_validation_error import MergeTrajectoriesValidationError
+from typing import Optional, Set
+from typing_extensions import Self
+
+class MergeTrajectories422Response(BaseModel):
+    """
+    MergeTrajectories422Response
+    """ # noqa: E501
+    detail: Optional[List[MergeTrajectoriesValidationError]] = None 
+    __properties: ClassVar[List[str]] = ["detail"]
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True, exclude_none=True))
+
+    def to_json(self) -> str:
+        """
+        Returns the JSON representation of the model using alias
+        
+        Do not use pydantic v2 .model_dump_json(by_alias=True, exclude_unset=True) here!
+        It is unable to resolve nested types generated by openapi-generator.
+        """
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of MergeTrajectories422Response from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        # override the default output from pydantic by calling `to_dict()` of each item in detail (list)
+        _items = []
+        if self.detail:
+            for _item in self.detail:
+                # >>> Modified from https://github.com/OpenAPITools/openapi-generator/blob/v7.6.0/modules/openapi-generator/src/main/resources/python/model_generic.mustache
+                #     to not drop empty elements in lists
+                if _item is not None:
+                    _items.append(_item.to_dict())
+                # <<< End modification
+            _dict['detail'] = _items
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of MergeTrajectories422Response from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "detail": [
+                # >>> Modified from https://github.com/OpenAPITools/openapi-generator/blob/v7.6.0/modules/openapi-generator/src/main/resources/python/model_generic.mustache
+                #     to allow dicts in lists
+                MergeTrajectoriesValidationError.from_dict(_item) if hasattr(MergeTrajectoriesValidationError, 'from_dict') else _item
+                # <<< End modification
+                for _item in obj["detail"]
+            ] if obj.get("detail") is not None else None
+        })
+        return _obj
+
+

wandelbots_api_client/v2/models/merge_trajectories_error.py

@@ -0,0 +1,97 @@
+# coding: utf-8
+
+"""
+    Wandelbots NOVA API
+
+    Interact with robots in an easy and intuitive way. 
+
+    The version of the OpenAPI document: 2.2.0 dev
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt
+from typing import Any, ClassVar, Dict, List, Union
+from wandelbots_api_client.v2.models.plan_trajectory_failed_response_error_feedback import PlanTrajectoryFailedResponseErrorFeedback
+from typing import Optional, Set
+from typing_extensions import Self
+
+class MergeTrajectoriesError(BaseModel):
+    """
+    MergeTrajectoriesError
+    """ # noqa: E501
+    error_feedback: PlanTrajectoryFailedResponseErrorFeedback 
+    error_location_on_trajectory: Union[StrictFloat, StrictInt] = Field(description="- The location is a scalar value that defines a position along a path, typically ranging from 0 to `n`,   where `n` denotes the number of motion commands - Each integer value of the location corresponds to a specific motion command,   while non-integer values interpolate positions within the segments. - The location is calculated from the joint path ") 
+    __properties: ClassVar[List[str]] = ["error_feedback", "error_location_on_trajectory"]
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True, exclude_none=True))
+
+    def to_json(self) -> str:
+        """
+        Returns the JSON representation of the model using alias
+        
+        Do not use pydantic v2 .model_dump_json(by_alias=True, exclude_unset=True) here!
+        It is unable to resolve nested types generated by openapi-generator.
+        """
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of MergeTrajectoriesError from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        # override the default output from pydantic by calling `to_dict()` of error_feedback
+        if self.error_feedback:
+            _dict['error_feedback'] = self.error_feedback.to_dict()
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of MergeTrajectoriesError from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "error_feedback": PlanTrajectoryFailedResponseErrorFeedback.from_dict(obj["error_feedback"]) if obj.get("error_feedback") is not None else None,
+            "error_location_on_trajectory": obj.get("error_location_on_trajectory")
+        })
+        return _obj
+
+