opentf-toolkit-nightly 0.60.0.dev1223__py3-none-any.whl → 0.60.0.dev1230__py3-none-any.whl

opentf/commons/__init__.py

@@ -29,8 +29,12 @@ from flask import Flask, current_app, make_response, request, g, Response
 
 from toposort import toposort, CircularDependencyError
 
+from .auth import (
+    initialize_authn_authz,
+    get_user_accessible_namespaces,
+    is_user_authorized,
+)
 from .config import (
-    ConfigError,
     make_argparser,
     configure_logging,
     read_config,
@@ -38,11 +42,7 @@ from .config import (
     get_named,
     get_debug_level,
 )
-from .auth import (
-    initialize_authn_authz,
-    get_user_accessible_namespaces,
-    is_user_authorized,
-)
+from .exceptions import ConfigError
 from .pubsub import make_dispatchqueue, make_event, publish, subscribe, unsubscribe
 from .schemas import *
 

opentf/commons/config.py

@@ -24,6 +24,7 @@ from logging.config import dictConfig
 
 import yaml
 
+from .exceptions import ConfigError
 from .schemas import validate_schema, SERVICECONFIG
 
 
@@ -44,10 +45,6 @@ DEBUG_LEVELS = {'CRITICAL', 'ERROR', 'WARNING', 'INFO', 'DEBUG', 'NOTSET'}
 ########################################################################
 
 
-class ConfigError(Exception):
-    """Invalid configuration file."""
-
-
 def make_argparser(description: str, configfile: str) -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(description=description)
     parser.add_argument('--descriptor', help='alternate descriptor file')

opentf/commons/datasources.py

@@ -18,9 +18,9 @@ from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple, Union
 
 from datetime import datetime
 
-
 from flask import current_app
 
+from opentf.commons.exceptions import ServiceError
 from opentf.commons.expressions import evaluate_bool
 from opentf.commons.selectors import match_selectors
 
@@ -49,21 +49,13 @@ CREATION_TIMESTAMP = 'creationTimestamp'
 ## Helpers
 
 
-class DataSourceScopeError(Exception):
+class DataSourceScopeError(ServiceError):
     """DataSourceScopeError class"""
 
-    def __init__(self, msg, details=None):
-        self.msg = msg
-        self.details = details
-
 
-class DataSourceDataError(Exception):
+class DataSourceDataError(ServiceError):
     """DataSourceDataError class"""
 
-    def __init__(self, msg, details=None):
-        self.msg = msg
-        self.details = details
-
 
 def _merge_dicts(dict1: Dict[str, Any], dict2: Dict[str, Any]) -> Dict[str, Any]:
     for k, v in dict1.items():

opentf/commons/exceptions.py

@@ -0,0 +1,108 @@
+# Copyright (c) 2024 Henix, Henix.fr
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Helpers for the OpenTestFactory orchestrator exceptions.
+
+```plaintext
+OpentfError
+|- ConfigError
+|- ServiceError
+|  |- AlreadyExistsError
+|  |- BadRequestError
+|  |- ConflictError
+|  |- InvalidRequestError
+|  |- NotFoundError
+|  |- UnauthorizedError
+|- ExecutionError
+```
+"""
+
+
+class OpentfError(Exception):
+    """Base orchestrator exceptions."""
+
+
+class ConfigError(OpentfError):
+    """Invalid configuration file."""
+
+
+class ServiceError(OpentfError):
+    """Base exception for request errors."""
+
+    status_name = 'ServiceError'
+
+    def __init__(self, msg, details=None):
+        self.msg = msg
+        self.details = details
+
+    @property
+    def http_status_name(self):
+        return self.status_name
+
+
+class AlreadyExistsError(ServiceError):
+    """AlreadyExists exception."""
+
+    status_name = 'AlreadyExists'
+
+
+class BadRequestError(ServiceError):
+    """BadRequest exception."""
+
+    status_name = 'BadRequest'
+
+
+class ConflictError(ServiceError):
+    """Invalid exception."""
+
+    status_name = 'Conflict'
+
+
+class InvalidRequestError(ServiceError):
+    """Invalid exception."""
+
+    status_name = 'Invalid'
+
+
+class NotFoundError(ServiceError):
+    """NotFound exception."""
+
+    status_name = 'NotFound'
+
+
+class UnauthorizedError(ServiceError):
+    """Invalid exception."""
+
+    status_name = 'Unauthorized'
+
+
+########################################################################
+## Exception helpers
+
+
+class ExecutionError(OpentfError):
+    """An ExecutionError exception.
+
+    Only expected to be raised in a workflow thread.  Will publish
+    the corresponding ExecutionError event if in this context.
+    """
+
+    def __init__(self, *args):
+        if args:
+            self.message = args[0]
+        else:
+            self.message = None
+
+    def __str__(self):
+        return str(self.message)

opentf/toolkit/channels.py

@@ -410,9 +410,11 @@ def process_output(
             filename, pattern = params.get('file'), params.get('pattern')
             if not filename and not pattern:
                 pattern = '*'
+            found = False
             for artifact in artifacts:
                 artifact_name = artifact.split('_')[-1]
                 if filename and filename == artifact_name:
+                    found = True
                     if not remote_path:
                         targeted_remote_path = core.join_path(
                             targeted_remote_path, artifact_name, is_windows
@@ -420,11 +422,15 @@ def process_output(
                     _put(targeted_remote_path, artifact)
                     continue
                 if pattern and fnmatch.fnmatch(artifact_name, pattern):
+                    found = True
                     pattern_path = core.join_path(
                         targeted_remote_path, artifact_name, is_windows
                     )
                     _put(pattern_path, artifact)
-            return resp
+            if found:
+                return resp
+            logs.append('ERROR,No artifact matching requested name/pattern found.')
+            return 2
         except Exception as err:
             logs.append(
                 f'ERROR,Could not send artifacts to remote path {remote_path}: {err}.'

opentf/toolkit/core.py

@@ -30,6 +30,7 @@ from opentf.commons import (
     make_event,
     make_uuid,
 )
+from opentf.commons.exceptions import ExecutionError
 
 
 ########################################################################
@@ -86,27 +87,6 @@ def _getstep() -> Dict[str, Any]:
     return _getbody()['step']
 
 
-########################################################################
-## Exception helpers
-
-
-class ExecutionError(Exception):
-    """An ExecutionError exception.
-
-    Only expected to be raised in a workflow thread.  Will publish
-    the corresponding ExecutionError event if in this context.
-    """
-
-    def __init__(self, *args):
-        if args:
-            self.message = args[0]
-        else:
-            self.message = None
-
-    def __str__(self):
-        return str(self.message)
-
-
 ########################################################################
 ## Publication helpers
 

{opentf_toolkit_nightly-0.60.0.dev1223.dist-info → opentf_toolkit_nightly-0.60.0.dev1230.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: opentf-toolkit-nightly
-Version: 0.60.0.dev1223
+Version: 0.60.0.dev1230
 Summary: OpenTestFactory Orchestrator Toolkit
 Home-page: https://gitlab.com/henixdevelopment/open-source/opentestfactory/python-toolkit
 Author: Martin Lafaix
@@ -16,14 +16,14 @@ Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >= 3.9.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: requests >=2.32
-Requires-Dist: PyJWT[crypto] >=2.9
-Requires-Dist: PyYAML >=6
-Requires-Dist: Flask <4,>=3
-Requires-Dist: jsonschema >=4.23
-Requires-Dist: toposort >=1.10
-Requires-Dist: waitress >=3
-Requires-Dist: paste >=3.10
+Requires-Dist: requests>=2.32
+Requires-Dist: PyJWT[crypto]>=2.9
+Requires-Dist: PyYAML>=6
+Requires-Dist: Flask<4,>=3
+Requires-Dist: jsonschema>=4.23
+Requires-Dist: toposort>=1.10
+Requires-Dist: waitress>=3
+Requires-Dist: paste>=3.10
 
 # opentf-toolkit
 

{opentf_toolkit_nightly-0.60.0.dev1223.dist-info → opentf_toolkit_nightly-0.60.0.dev1230.dist-info}/RECORD

@@ -1,7 +1,8 @@
-opentf/commons/__init__.py,sha256=JLif958eOnOeJSQ6bLF-Dpr_aFJ3JtxHrjvUe_KbzEc,22579
+opentf/commons/__init__.py,sha256=xbDeHfYHshJtopyxljdTWw5vUXcUKosU6ILDNcEBZrY,22598
 opentf/commons/auth.py,sha256=bM2Z3kxm2Wku1lKXaRAIg37LHvXWAXIZIqjplDfN2P8,15899
-opentf/commons/config.py,sha256=dyus4K5Zdmcftc3Y9Z1YRkzA1KwiRLHoeAlg2_A49QM,7876
-opentf/commons/datasources.py,sha256=GSbjrYnZQup2B3r7T7l3C_o6R2jS13nQiu6dRitoenk,26194
+opentf/commons/config.py,sha256=_8WzSaeB0yjGRa8mTQ69OASyUSbKZbwNOiKpMp2jFwI,7842
+opentf/commons/datasources.py,sha256=c_bqqpiFibkRur75oIwV-gZtCLnluTS-9oVBoQ_NgGo,26054
+opentf/commons/exceptions.py,sha256=7dhUXO8iyAbqVwlUKxZhgRzGqVcb7LkG39hFlm-VxIA,2407
 opentf/commons/expressions.py,sha256=jM_YKXVOFhvOE2aE2IuacuvxhIsOYTFs2oQkpcbWR6g,19645
 opentf/commons/pubsub.py,sha256=M0bvajR9raUP-xe5mfRjdrweZyHQw1_Qsy56gS-Sck4,7676
 opentf/commons/schemas.py,sha256=cjyPXRhRIPQauCdy9zGRaOkqdVcklz47JnljTTLNpq8,4254
@@ -56,10 +57,10 @@ opentf/schemas/opentestfactory.org/v1beta2/ServiceConfig.json,sha256=rEvK2YWL5lG
 opentf/scripts/launch_java_service.sh,sha256=S0jAaCuv2sZy0Gf2NGBuPX-eD531rcM-b0fNyhmzSjw,2423
 opentf/scripts/startup.py,sha256=sggwEpMx7PTaSgYzs-2uCF5YZzpsncMyTlfF_G60CrE,21518
 opentf/toolkit/__init__.py,sha256=mYeJPZ92ulbTBItqEsZgF4nnuRh6G19QPY3Jxc92ifc,23028
-opentf/toolkit/channels.py,sha256=lqFGQiHYiGMaYuGAXmbyaIsW2B_9KlaUTF8LiUIQOAg,23399
-opentf/toolkit/core.py,sha256=cscUkwdwvLkerqMRL05dgtKJ42QbBQQc28kRBiyZM9o,9883
-opentf_toolkit_nightly-0.60.0.dev1223.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-opentf_toolkit_nightly-0.60.0.dev1223.dist-info/METADATA,sha256=R2zLhfHUmpQ3ooKvqJtLUnwhHhwCqxpXKVMzB1U5G5c,1940
-opentf_toolkit_nightly-0.60.0.dev1223.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-opentf_toolkit_nightly-0.60.0.dev1223.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
-opentf_toolkit_nightly-0.60.0.dev1223.dist-info/RECORD,,
+opentf/toolkit/channels.py,sha256=h5QLrr4vNLKjt8K524ZcJMqmHhE9kV5lxiW-MN6zMvQ,23622
+opentf/toolkit/core.py,sha256=fqnGgaYnuVcd4fyeNIwpc0QtyUo7jsKeVgdkBfY3iqo,9443
+opentf_toolkit_nightly-0.60.0.dev1230.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+opentf_toolkit_nightly-0.60.0.dev1230.dist-info/METADATA,sha256=PdJ6rkck6iblkKJG4M0n7Us3nWTGIOULosmmxqGlkig,1932
+opentf_toolkit_nightly-0.60.0.dev1230.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+opentf_toolkit_nightly-0.60.0.dev1230.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
+opentf_toolkit_nightly-0.60.0.dev1230.dist-info/RECORD,,

{opentf_toolkit_nightly-0.60.0.dev1223.dist-info → opentf_toolkit_nightly-0.60.0.dev1230.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.5.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any