streamsets 6.6.2.dev0__tar.gz → 6.7.0.dev0__tar.gz

{streamsets-6.6.2.dev0 → streamsets-6.7.0.dev0}/HISTORY.rst

@@ -3,6 +3,12 @@
 
 History
 =======
+6.6.2 (August 2025)
+----------------------
+* Fixed race conditions when retrieving objects
+
+* Bug fixes and improvements
+
 6.6.1 (June 2025)
 ----------------------
 * Fixed an issue that caused an error to be raised when calling the method :py:meth:`streamsets.sdk.ControlHub.delete_deployment`.

{streamsets-6.6.2.dev0/streamsets.egg-info → streamsets-6.7.0.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: streamsets
-Version: 6.6.2.dev0
+Version: 6.7.0.dev0
 Summary: A Python SDK for StreamSets
 Author: StreamSets Inc
 Classifier: Development Status :: 5 - Production/Stable

{streamsets-6.6.2.dev0 → streamsets-6.7.0.dev0}/streamsets/sdk/__version__.py

@@ -2,4 +2,4 @@
 #  PID 5900-BAF
 #  Copyright StreamSets Inc., an IBM Company 2025
 
-__version__ = "6.6.2dev0"
+__version__ = "6.7.0dev0"

{streamsets-6.6.2.dev0 → streamsets-6.7.0.dev0}/streamsets/sdk/sch.py

@@ -3962,19 +3962,49 @@ class ControlHub:
             raise start_deployment_exception
         return enable_deployments_command
 
-    def stop_deployment(self, *deployments):
+    def stop_deployment(self, *deployments, force: bool = False):
         """Stop Deployments.
 
         Args:
             *deployments: One or more instances of :py:class:`streamsets.sdk.sch_models.Deployment`.
+            force (:obj:`bool`, optional): Force deployment to stop. Default: ``False``.
         """
         deployments = [deployment for deployment in deployments if not isinstance(deployment, NotImplementedDeployment)]
         if not deployments:
             logger.info('No deployments to stop. Returning')
             return
-        deployment_ids = [deployment.deployment_id for deployment in deployments]
-        logger.info('Stopping deployments %s ...', deployment_ids)
-        stop_deployments_command = self.api_client.disable_deployments(deployment_ids)
+
+        force_stop_deployment_ids = []
+
+        if force:
+            # only force stop k8s deployments
+            force_stop_deployment_ids = [
+                deployment.deployment_id for deployment in deployments if isinstance(deployment, KubernetesDeployment)
+            ]
+
+        disable_deployment_ids = [
+            deployment.deployment_id
+            for deployment in deployments
+            if deployment.deployment_id not in force_stop_deployment_ids
+        ]
+
+        if force and not force_stop_deployment_ids:
+            raise ValueError(
+                "Invalid operation: force=True was specified, but no Kubernetes deployments were provided."
+            )
+        if force and force_stop_deployment_ids and disable_deployment_ids:
+            raise ValueError(
+                "Invalid operation: when force=True, only Kubernetes deployments may be stopped. "
+                "Non-Kubernetes deployments were also included."
+            )
+
+        stop_deployments_command = None
+
+        if force_stop_deployment_ids:
+            for deployment_id in force_stop_deployment_ids:
+                stop_deployments_command = self.api_client.force_stop_deployment(deployment_id, confirm=True)
+        if disable_deployment_ids:
+            stop_deployments_command = self.api_client.disable_deployments(disable_deployment_ids)
 
         stop_deployment_exception = None
         for deployment in deployments:

{streamsets-6.6.2.dev0 → streamsets-6.7.0.dev0}/streamsets/sdk/sch_api.py

@@ -8100,6 +8100,24 @@ class ApiClient(object):
         initial_state_display_label = self.get_deployment(deployment_id).response.json()['stateDisplayLabel']
         wait_for_condition(condition=condition, timeout=timeout_sec, failure=failure, success=success)
 
+    def force_stop_deployment(self, deployment_id: str, confirm: bool = False):
+        """Force stop a deployment.
+
+        Args:
+            deployment_id (:obj:`str`): Id of the deployment.
+            confirm (:obj:`bool`, optional): Must be True to actually perform the
+            force stop. Defaults to False.
+
+        Returns:
+            An instance of :py:class:`streamsets.sdk.sch_api.Command`.
+        """
+        response = self._post(
+            app='provisioning',
+            endpoint='/v{}/csp/deployment/{}/forceStop'.format(self.api_version, deployment_id),
+            params={'confirm': 'true' if confirm else 'false'},
+        )
+        return Command(self, response)
+
     def get_deployment_engine_token(self, deployment_id):
         """Fetches a Engine Token for the Deployment.
 

{streamsets-6.6.2.dev0 → streamsets-6.7.0.dev0}/streamsets/sdk/sch_models.py

@@ -1,4 +1,6 @@
-# Copyright 2021 StreamSets Inc.
+#  IBM Confidential
+#  PID 5900-BAF
+#  Copyright StreamSets Inc., an IBM Company 2025
 
 """Classes for ControlHub-related models.
 
@@ -51,8 +53,8 @@ from .st_models import PipelineBuilder as StPipelineBuilder
 from .st_models import Stage as StStage
 from .utils import (
     DEFAULT_PROVISIONING_SPEC, METERING_METRIC_LOOKUP, TRANSFORMER_DEFAULT_EXECUTION_MODE, MutableKwargs, SeekableList,
-    Version, build_tag_from_raw_tag, format_sch_log, get_attribute, get_bw_compatibility_map,
-    get_library_directory_name, get_params, get_stage_library_display_name_from_library,
+    Version, build_tag_from_raw_tag, convert_last_modified_on_field_for_saql, format_sch_log, get_attribute,
+    get_bw_compatibility_map, get_library_directory_name, get_params, get_stage_library_display_name_from_library,
     get_stage_library_name_from_display_name, get_topology_nodes, reversed_dict, set_acl,
     top_objects_by_metering_metric, update_acl_permissions, wait_for_condition,
 )
@@ -3632,150 +3634,6 @@ class Pipeline(BaseModel):
 
         return stage_list
 
-    @property
-    def start_event(self):
-        """Get the Start Event of the Pipeline."""
-        library_definitions = self._library_definitions
-        stage = self._pipeline_definition.get('startEventStages', [{}])[0]
-
-        if not stage:
-            return None
-
-        stage_definition = next(
-            (stage_def for stage_def in library_definitions['stages'] if stage_def['name'] == stage['stageName']),
-            {},
-        )
-
-        stage_class = self._get_stage_class(stage_definition, library_definitions)
-        stage_object = stage_class(stage=stage, pipeline=self)
-
-        return stage_object
-
-    @property
-    def stop_event(self):
-        """Get the Stop Event of the Pipeline."""
-        library_definitions = self._library_definitions
-        stage = self._pipeline_definition.get('stopEventStages', [{}])[0]
-
-        if not stage:
-            return None
-
-        stage_definition = next(
-            (stage_def for stage_def in library_definitions['stages'] if stage_def['name'] == stage['stageName']),
-            {},
-        )
-
-        stage_class = self._get_stage_class(stage_definition, library_definitions)
-        stage_object = stage_class(stage=stage, pipeline=self)
-
-        return stage_object
-
-    @property
-    def test_origin(self):
-        """Get the Test Origin of the Pipeline."""
-        library_definitions = self._library_definitions
-        stage = self._pipeline_definition.get('testOriginStage', [{}])
-
-        if not stage:
-            return None
-
-        stage_definition = next(
-            (stage_def for stage_def in library_definitions['stages'] if stage_def['name'] == stage['stageName']),
-            {},
-        )
-
-        stage_class = self._get_stage_class(stage_definition, library_definitions)
-        stage_object = stage_class(stage=stage, pipeline=self)
-
-        return stage_object
-
-    def set_start_event(self, label=None, name=None, library=None):
-        """Set the Start Event of the Pipeline."""
-
-        # If _library_definitions is not populated, we call the internal _library_definitions property to perform
-        # lazy-loading of the underlying data
-        if not self._data_internal['libraryDefinitions']:
-            self._library_definitions
-
-        try:
-            builder = self._get_builder()
-        # ValueError gets raised by the Engines class when trying to find an inaccessible Engine
-        # However, sometimes ControlHub finds the Inaccessible Engine instance but we then error out later
-        # downstream of the get_pipeline_builder method and throws an InternalServerError
-        except (ValueError, InternalServerError) as e:
-            raise ValueError(
-                'Editing pipeline {} is not supported when the engine is not accessible,'
-                ' please check if the engine is running and try again.'.format(self.pipeline_id)
-            ) from e
-
-        stage = builder.add_start_event_stage(label=label, name=name, library=library)
-
-        # Pass the newly created stage into the Pipeline
-        self._pipeline_definition['startEventStages'] = builder._pipeline[builder._config_key]['startEventStages']
-
-        # Set the value in the Pipeline configuration
-        self.configuration.start_event = self._builder._stage_to_configuration_name(stage._data)
-
-        return stage
-
-    def set_stop_event(self, label=None, name=None, library=None):
-        """Set the Stop Event of the Pipeline."""
-
-        # If _library_definitions is not populated, we call the internal _library_definitions property to perform
-        # lazy-loading of the underlying data
-        if not self._data_internal['libraryDefinitions']:
-            self._library_definitions
-
-        try:
-            builder = self._get_builder()
-        # ValueError gets raised by the Engines class when trying to find an inaccessible Engine
-        # However, sometimes ControlHub finds the Inaccessible Engine instance but we then error out later
-        # downstream of the get_pipeline_builder method and throws an InternalServerError
-        except (ValueError, InternalServerError) as e:
-            raise ValueError(
-                'Editing pipeline {} is not supported when the engine is not accessible,'
-                ' please check if the engine is running and try again.'.format(self.pipeline_id)
-            ) from e
-
-        stage = builder.add_stop_event_stage(label=label, name=name, library=library)
-
-        # Pass the newly created stage into the Pipeline
-        self._pipeline_definition['stopEventStages'] = builder._pipeline[builder._config_key]['stopEventStages']
-
-        # Set the value in the Pipeline configuration
-        self.configuration.stop_event = self._builder._stage_to_configuration_name(stage._data)
-
-        return stage
-
-    def set_test_origin(self, label=None, name=None, library=None):
-        """Set the Test Origin of the Pipeline."""
-
-        # If _library_definitions is not populated, we call the internal _library_definitions property to perform
-        # lazy-loading of the underlying data
-        if not self._data_internal['libraryDefinitions']:
-            self._library_definitions
-
-        try:
-            builder = self._get_builder()
-        # ValueError gets raised by the Engines class when trying to find an inaccessible Engine
-        # However, sometimes ControlHub finds the Inaccessible Engine instance but we then error out later
-        # downstream of the get_pipeline_builder method and throws an InternalServerError
-        except (ValueError, InternalServerError) as e:
-            raise ValueError(
-                'Editing pipeline {} is not supported when the engine is not accessible,'
-                ' please check if the engine is running and try again.'.format(self.pipeline_id)
-            ) from e
-
-        stage = builder.add_test_origin_stage(label=label, name=name, library=library)
-
-        # Pass the newly created stage into the Pipeline
-        self._pipeline_definition['testOriginStage'] = builder._pipeline[builder._config_key]['testOriginStage']
-
-        # Set the value in Pipeline configuration
-        self.configuration.test_origin = self._builder._stage_to_configuration_name(stage._data)
-
-        return stage
-
     @property
     def error_stage(self):
         """Get the error stage of the Pipeline."""
@@ -4343,7 +4201,7 @@ class Pipelines(CollectionModel):
         kwargs_defaults = {
             'offset': None,
             'len': None,
-            'order_by': 'NAME',
+            'order_by': 'LAST_MODIFIED_ON',
             'order': None,
             'system': None,
             'filter_text': None,
@@ -4399,7 +4257,7 @@ class Pipelines(CollectionModel):
                 response = self._control_hub.api_client.get_fragments_by_query(
                     search=search,
                     org_id=self._control_hub.organization,
-                    order_by=kwargs_unioned['order_by'].lower(),
+                    order_by=convert_last_modified_on_field_for_saql(kwargs_unioned['order_by'].lower()),
                     offset=kwargs_unioned['offset'],
                     len=kwargs_unioned['len'],
                 ).response.json()
@@ -4424,7 +4282,7 @@ class Pipelines(CollectionModel):
             response = self._control_hub.api_client.get_pipelines_by_query(
                 search=search,
                 org_id=self._control_hub.organization,
-                order_by=kwargs_unioned['order_by'].lower(),
+                order_by=convert_last_modified_on_field_for_saql(kwargs_unioned['order_by'].lower()),
                 offset=kwargs_unioned['offset'],
                 len=kwargs_unioned['len'],
             ).response.json()
@@ -4862,7 +4720,7 @@ class Tag(BaseModel):
     @property
     def tag(self):
         """Get the Tag."""
-        return self.id.split(':')[0]
+        return ':'.join(self.id.split(':')[:-1])
 
 
 @analytics_class_decorator
@@ -5647,7 +5505,7 @@ class JobSequences(CollectionModel):
                 class_kwargs (:obj:`dict`): a dict of additional arguments required by the class_type's init
         """
 
-        kwargs_defaults = {'offset': 0, 'len': None, 'order_by': 'NAME', 'order': 'ASC'}
+        kwargs_defaults = {'offset': 0, 'len': None, 'order_by': 'LAST_MODIFIED_TIME', 'order': 'ASC'}
         kwargs_instance = MutableKwargs(kwargs_defaults, kwargs)
         kwargs_unioned = kwargs_instance.union()
         if 'id' in kwargs_unioned:
@@ -5826,7 +5684,7 @@ class Job(BaseModel):
         data_collectors = SeekableList()
         for pipeline_status in self.pipeline_status:
             # warning: some downstream uses incorrectly rely on the ValueError raised by the SeekableList here
-            data_collector = self._control_hub.data_collectors.get(id=pipeline_status.sdc_id)
+            data_collector = self._control_hub.engines.get(id=pipeline_status.sdc_id, engine_type='COLLECTOR')
             pipeline_name = pipeline_status.name
             data_collectors.append(JobDataCollector(data_collector=data_collector, pipeline_name=pipeline_name))
         return data_collectors
@@ -5836,7 +5694,7 @@ class Job(BaseModel):
         transformers = SeekableList()
         for pipeline_status in self.pipeline_status:
             # warning: some downstream uses incorrectly rely on the ValueError raised by the SeekableList here
-            transformer = self._control_hub.transformers.get(id=pipeline_status.sdc_id)
+            transformer = self._control_hub.engines.get(id=pipeline_status.sdc_id, engine_type='TRANSFORMER')
             pipeline_name = pipeline_status.name
             transformers.append(JobTransformer(transformer=transformer, pipeline_name=pipeline_name))
         return transformers
@@ -6560,7 +6418,7 @@ class DraftRuns(CollectionModel):
                 class_type (:py:class:`streamsets.sdk.sch_models.DraftRun`): the type of class to instantiate
                 class_kwargs (:obj:`dict`): a dict of additional arguments required by the class_type's init
         """
-        kwargs_defaults = {'order_by': 'name', 'search': None, 'offset': 0, 'len': None}
+        kwargs_defaults = {'order_by': 'modified_on', 'search': None, 'offset': 0, 'len': None}
         kwargs_instance = MutableKwargs(kwargs_defaults, kwargs)
         kwargs_unioned = kwargs_instance.union()
         response = self._control_hub.api_client.get_draft_runs_by_query(
@@ -6638,7 +6496,7 @@ class Jobs(CollectionModel):
                 class_kwargs (:obj:`dict`): a dict of additional arguments required by the class_type's init
         """
         kwargs_defaults = {
-            'order_by': 'NAME',
+            'order_by': 'CREATE_TIME',
             'order': 'ASC',
             'removed': False,
             'system': False,
@@ -6695,7 +6553,7 @@ class Jobs(CollectionModel):
                 response = self._control_hub.api_client.get_job_templates_by_query(
                     search=search,
                     org_id=self._control_hub.organization,
-                    order_by=kwargs_unioned['order_by'].lower(),
+                    order_by=convert_last_modified_on_field_for_saql(kwargs_unioned['order_by'].lower()),
                     offset=kwargs_unioned['offset'],
                     len=kwargs_unioned['len'],
                 ).response.json()
@@ -6703,7 +6561,7 @@ class Jobs(CollectionModel):
                 response = self._control_hub.api_client.get_jobs_by_query(
                     search=search,
                     org_id=self._control_hub.organization,
-                    order_by=kwargs_unioned['order_by'].lower(),
+                    order_by=convert_last_modified_on_field_for_saql(kwargs_unioned['order_by'].lower()),
                     offset=kwargs_unioned['offset'],
                     len=kwargs_unioned['len'],
                 ).response.json()
@@ -7549,7 +7407,7 @@ class Topologies(CollectionModel):
                 class_type (:py:class:`streamsets.sdk.sch_models.Topology`): the type of class to instantiate
                 class_kwargs (:obj:`dict`): a dict of additional arguments required by the class_type's init
         """
-        kwargs_defaults = {'offset': 0, 'len': None, 'order_by': 'NAME', 'order': 'ASC'}
+        kwargs_defaults = {'offset': 0, 'len': None, 'order_by': 'LAST_MODIFIED_TIME', 'order': 'ASC'}
         kwargs_instance = MutableKwargs(kwargs_defaults, kwargs)
         kwargs_unioned = kwargs_instance.union()
         response = self._control_hub.api_client.return_all_topologies(
@@ -8524,7 +8382,7 @@ class Environments(CollectionModel):
         kwargs_defaults = {
             'offset': None,
             'len': None,
-            'order_by': 'NAME',
+            'order_by': 'LAST_MODIFIED_TIME',
             'order': 'ASC',
             'tag': None,
             'with_total_count': False,
@@ -9060,7 +8918,7 @@ class Engines(CollectionModel):
             # pagination
             'offset': 0,
             'len': None,
-            'order_by': 'LAST_REPORTED_TIME',
+            'order_by': 'HTTP_URL',
             'order': 'ASC',
             # server-side filtering
             'label': label,
@@ -9865,7 +9723,7 @@ class Deployments(CollectionModel):
         kwargs_defaults = {
             'offset': None,
             'len': None,
-            'order_by': 'NAME',
+            'order_by': 'LAST_MODIFIED_TIME',
             'order': 'ASC',
             'with_total_count': False,
             'state_display_label': None,
@@ -11998,7 +11856,7 @@ class Subscriptions(CollectionModel):
                 class_type (:py:class:`streamsets.sdk.sch_models.Subscription`): the type of class to instantiate
                 class_kwargs (:obj:`dict`): a dict of additional arguments required by the class_type's init
         """
-        kwargs_defaults = {'offset': 0, 'len': None, 'order_by': 'NAME', 'order': 'ASC'}
+        kwargs_defaults = {'offset': 0, 'len': None, 'order_by': 'CREATE_TIME', 'order': 'ASC'}
         kwargs_instance = MutableKwargs(kwargs_defaults, kwargs)
         kwargs_unioned = kwargs_instance.union()
         response = self._control_hub.api_client.get_all_event_subscriptions(
@@ -12726,7 +12584,7 @@ class Connections(CollectionModel):
         kwargs_defaults = {
             'offset': None,
             'len': None,
-            'order_by': 'NAME',
+            'order_by': 'LAST_MODIFIED_TIME',
             'order': 'ASC',
             'filter_text': None,
             'with_total_count': False,

{streamsets-6.6.2.dev0 → streamsets-6.7.0.dev0}/streamsets/sdk/sdc_models.py

@@ -21,8 +21,8 @@ from .constants import (
 from .exceptions import ServiceDefinitionNotFound
 from .models import Configuration, _StageWithPredicates
 from .utils import (
-    SeekableList, determine_fragment_label, format_log, get_accepted_labels_libraries_and_names, get_attribute,
-    get_color_icon_from_stage_definition, get_open_output_lanes, get_params, pipeline_json_encoder,
+    SeekableList, determine_fragment_label, format_log, get_attribute, get_color_icon_from_stage_definition,
+    get_open_output_lanes, get_params, pipeline_json_encoder,
 )
 
 # fmt: on
@@ -1062,28 +1062,11 @@ class PipelineBuilder:
         Returns:
             An instance of :py:class:`streamsets.sdk.sdc_models.Stage`.
         """
-        accepted_labels, accepted_libraries, accepted_java_names = get_accepted_labels_libraries_and_names(
-            self, 'startEventStage'
-        )
-
-        if label and label not in accepted_labels:
-            raise ValueError('Stage with label {} is not a supported start event stage'.format(label))
-        if name and name not in accepted_java_names:
-            raise ValueError('Stage with name {} is not a supported start event stage'.format(name))
-        if library and library not in accepted_libraries:
-            raise ValueError('Stage with library {} is not a supported start event stage'.format(library))
-
         stage_instance, stage_definition = next(
             (stage.instance, stage.definition)
             for stage in self._get_stage_data(label=label, name=name, library=library)
             if stage.definition.get('pipelineLifecycleStage') is True
         )
-
-        # We need instanceName in the form <instance_name>_StartEventStage and not <instance_name>_01
-        instance_name_split_list = stage_instance['instanceName'].split('_')
-        instance_name_split_list[-1] = 'StartEventStage'
-        stage_instance['instanceName'] = '_'.join(instance_name_split_list)
-
         self._pipeline[self._config_key]['startEventStages'] = [stage_instance]
         self._set_pipeline_configuration('startEventStage', self._stage_to_configuration_name(stage_instance))
         return self._all_stages.get(stage_instance['stageName'], Stage)(
@@ -1109,28 +1092,11 @@ class PipelineBuilder:
         Returns:
             An instance of :py:class:`streamsets.sdk.sdc_models.Stage`.
         """
-        accepted_labels, accepted_libraries, accepted_java_names = get_accepted_labels_libraries_and_names(
-            self, 'stopEventStage'
-        )
-
-        if label and label not in accepted_labels:
-            raise ValueError('Stage with label {} is not a supported stop event stage'.format(label))
-        if name and name not in accepted_java_names:
-            raise ValueError('Stage with name {} is not a supported stop event stage'.format(name))
-        if library and library not in accepted_libraries:
-            raise ValueError('Stage with library {} is not a supported stop event stage'.format(library))
-
         stage_instance, stage_definition = next(
             (stage.instance, stage.definition)
             for stage in self._get_stage_data(label=label, name=name, library=library)
             if stage.definition.get('pipelineLifecycleStage') is True
         )
-
-        # We need instanceName in the form <instance_name>_StartEventStage and not <instance_name>_01
-        instance_name_split_list = stage_instance['instanceName'].split('_')
-        instance_name_split_list[-1] = 'StopEventStage'
-        stage_instance['instanceName'] = '_'.join(instance_name_split_list)
-
         self._pipeline[self._config_key]['stopEventStages'] = [stage_instance]
         self._set_pipeline_configuration('stopEventStage', self._stage_to_configuration_name(stage_instance))
         return self._all_stages.get(stage_instance['stageName'], Stage)(
@@ -1155,30 +1121,12 @@ class PipelineBuilder:
 
         Returns:
             An instance of :py:class:`streamsets.sdk.sdc_models.Stage`.
-
         """
-        accepted_labels, accepted_libraries, accepted_java_names = get_accepted_labels_libraries_and_names(
-            self, 'testOriginStage'
-        )
-
-        if label and label not in accepted_labels:
-            raise ValueError('Stage with label {} is not a supported test origin stage'.format(label))
-        if name and name not in accepted_java_names:
-            raise ValueError('Stage with name {} is not a supported test origin stage'.format(name))
-        if library and library not in accepted_libraries:
-            raise ValueError('Stage with library {} is not a supported test origin stage'.format(library))
-
         stage_instance, stage_definition = next(
             (stage.instance, stage.definition)
             for stage in self._get_stage_data(label=label, name=name, library=library)
             if stage.definition.get('type') == 'SOURCE'
         )
-
-        # We need instanceName in the form <instance_name>_StartEventStage and not <instance_name>_01
-        instance_name_split_list = stage_instance['instanceName'].split('_')
-        instance_name_split_list[-1] = 'TestOriginStage'
-        stage_instance['instanceName'] = '_'.join(instance_name_split_list)
-
         self._pipeline[self._config_key]['testOriginStage'] = stage_instance
         self._set_pipeline_configuration('testOriginStage', self._stage_to_configuration_name(stage_instance))
         return self._all_stages.get(stage_instance['stageName'], Stage)(

{streamsets-6.6.2.dev0 → streamsets-6.7.0.dev0}/streamsets/sdk/st_models.py

@@ -19,8 +19,7 @@ from .constants import ST_STAGE_ATTRIBUTE_RENAME_ALIASES as STAGE_ATTRIBUTE_RENA
 from .constants import ServiceConfigurationProperty, StageConfigurationProperty
 from .models import Configuration, _StageWithPredicates
 from .utils import (
-    SeekableList, format_log, get_accepted_labels_libraries_and_names, get_attribute,
-    get_color_icon_from_stage_definition, get_params, pipeline_json_encoder,
+    SeekableList, format_log, get_attribute, get_color_icon_from_stage_definition, get_params, pipeline_json_encoder,
 )
 
 # fmt: on
@@ -898,30 +897,14 @@ class PipelineBuilder:
         Returns:
             An instance of :py:class:`streamsets.sdk.st_models.Stage`.
         """
-        accepted_labels, accepted_libraries, accepted_java_names = get_accepted_labels_libraries_and_names(
-            self, 'startEventStage'
-        )
-
-        if label and label not in accepted_labels:
-            raise ValueError('Stage with label {} is not a supported start event stage'.format(label))
-        if name and name not in accepted_java_names:
-            raise ValueError('Stage with name {} is not a supported start event stage'.format(name))
-        if library and library not in accepted_libraries:
-            raise ValueError('Stage with library {} is not a supported start event stage'.format(library))
-
         stage_instance, stage_definition = next(
             (stage.instance, stage.definition)
             for stage in self._get_stage_data(label=label, name=name, library=library)
             if stage.definition.get('pipelineLifecycleStage') is True
         )
-
-        # We need instanceName in the form <instance_name>_StartEventStage and not <instance_name>_01
-        instance_name_split_list = stage_instance['instanceName'].split('_')
-        instance_name_split_list[-1] = 'StartEventStage'
-        stage_instance['instanceName'] = '_'.join(instance_name_split_list)
-
-        self._pipeline[self._config_key]['startEventStages'] = [stage_instance]
+        self._pipeline['pipelineConfig']['startEventStages'] = [stage_instance]
         self._set_pipeline_configuration('startEventStage', self._stage_to_configuration_name(stage_instance))
+
         return self._all_stages.get(stage_instance['stageName'], Stage)(
             stage=stage_instance,
             output_streams=stage_definition.get('outputStreams', 0),
@@ -945,31 +928,14 @@ class PipelineBuilder:
         Returns:
             An instance of :py:class:`streamsets.sdk.st_models.Stage`.
         """
-        # Create accepted lists
-        accepted_labels, accepted_libraries, accepted_java_names = get_accepted_labels_libraries_and_names(
-            self, 'stopEventStage'
-        )
-
-        if label and label not in accepted_labels:
-            raise ValueError('Stage with label {} is not a supported stop event stage'.format(label))
-        if name and name not in accepted_java_names:
-            raise ValueError('Stage with name {} is not a supported stop event stage'.format(name))
-        if library and library not in accepted_libraries:
-            raise ValueError('Stage with library {} is not a supported stop event stage'.format(library))
-
         stage_instance, stage_definition = next(
             (stage.instance, stage.definition)
             for stage in self._get_stage_data(label=label, name=name, library=library)
             if stage.definition.get('pipelineLifecycleStage') is True
         )
-
-        # We need instanceName in the form <instance_name>_StartEventStage and not <instance_name>_01
-        instance_name_split_list = stage_instance['instanceName'].split('_')
-        instance_name_split_list[-1] = 'StopEventStage'
-        stage_instance['instanceName'] = '_'.join(instance_name_split_list)
-
-        self._pipeline[self._config_key]['stopEventStages'] = [stage_instance]
+        self._pipeline['pipelineConfig']['stopEventStages'] = [stage_instance]
         self._set_pipeline_configuration('stopEventStage', self._stage_to_configuration_name(stage_instance))
+
         return self._all_stages.get(stage_instance['stageName'], Stage)(
             stage=stage_instance,
             output_streams=stage_definition.get('outputStreams', 0),

{streamsets-6.6.2.dev0 → streamsets-6.7.0.dev0}/streamsets/sdk/utils.py

@@ -1,4 +1,6 @@
-# Copyright 2021 StreamSets Inc.
+#  IBM Confidential
+#  PID 5900-BAF
+#  Copyright StreamSets Inc., an IBM Company 2025
 
 """Assorted utility functions."""
 
@@ -1060,33 +1062,20 @@ def validate_pipeline_stages(pipeline):
             raise ValueError("Stage {} does not exist within Engine Libraries".format(stage.instance_name))
 
 
-def get_accepted_labels_libraries_and_names(pipeline_builder, field_name):
-    # We need the  field_name library definition in order to get accepted libraries, names & labels.
-    # The accepted labels and associated java_name values are of the form:
-    # {'labels': [label1 (library: Library_name1), label2 (Library: library_name2)],
-    #  'values': [java_name_for_label1, java_name_for_label2]}
-    config_definition = next(
-        (
-            config.get('model')
-            for config in pipeline_builder._definitions['pipeline'][0]['configDefinitions']
-            if config['fieldName'] == field_name
-        ),
-        {},
-    )
-    if not config_definition:
-        raise RuntimeError('Could not pull the {} library definitions'.format(field_name))
-
-    # Create accepted lists
-    accepted_labels = []
-    accepted_libraries = []
-    accepted_java_names = []
-    for idx, field in enumerate(config_definition['labels']):
-        label_name = field.split(' (')[0]
-        accepted_labels.append(label_name)
+def convert_last_modified_on_field_for_saql(maybe_last_modified_on):
+    """Trims ``last_`` prefix from ``last_modified_on`` property.
 
-        library_name = re.search(r'Library:\s*([^)]+)\)', field)
-        accepted_libraries.append(library_name.group(1).strip())
+    Make ``last_modified_on`` property compliant with Advanced query language endpoints which
+    support only ``modified_on`` property.
 
-        accepted_java_names.append(config_definition['values'][idx])
+    Args:
+        maybe_last_modified_on (:py:obj:`str`): A property name for resource pipeline, job etc.
 
-    return accepted_labels, accepted_libraries, accepted_java_names
+    Returns:
+        A :py:obj:`str` with property name without prefix or original value if it is not ``last_modified_on``.
+    """
+    if re.match(r'^last_modified_on[+\-]?$', maybe_last_modified_on.lower()):
+        return maybe_last_modified_on.lower().replace('last_', '')
+    if re.match(r'^create_time[+\-]?$', maybe_last_modified_on.lower()):
+        return "created_on"
+    return maybe_last_modified_on