opentf-toolkit-nightly 0.50.0.dev650__py3-none-any.whl → 0.50.0.dev653__py3-none-any.whl

opentf/commons/__init__.py

@@ -331,29 +331,6 @@ def get_actor() -> Optional[str]:
     return None
 
 
-def run_app(app) -> None:
-    """Start the app.
-
-    Using waitress as the wsgi server.  The logging service is
-    configured to only show waitress errors and up messages.
-
-    Access logs are only displayed when in DEBUG mode.
-    """
-    context = app.config['CONTEXT']
-
-    from waitress import serve
-
-    if _get_debug_level(app.name) == 'DEBUG':
-        from paste.translogger import TransLogger
-
-        app = TransLogger(app, format=ACCESSLOG_FORMAT, setup_console_handler=False)
-    else:
-        logging.getLogger('waitress').setLevel('ERROR')
-        app.logger.info(f'Serving on http://{context["host"]}:{context["port"]}')
-
-    serve(app, host=context['host'], port=context['port'])
-
-
 class EventbusLogger(logging.Handler):
     """A Notification logger.
 
@@ -482,6 +459,76 @@ def make_app(
     return app
 
 
+def get_context_parameter(app: Flask, contextparam: str, default: int) -> int:
+    """Get an integer parameter from configuration context.
+
+    Exits with an error code of 2 if the parameter is not an integer.
+
+    # Required parameters
+
+    - app: a Flask object
+    - contextparam: a string
+    - default: an integer
+
+    # Returned value
+
+    An integer.  `default` if the context parameter is not defined.
+    """
+    try:
+        return int(app.config['CONTEXT'].get(contextparam, default))
+    except ValueError as err:
+        app.logger.error(
+            'Configuration parameter %s not an integer: %s', contextparam, str(err)
+        )
+        sys.exit(2)
+
+
+def get_context_service(app: Flask, service: str) -> Dict[str, Any]:
+    """Get service specification from configuration context.
+
+    Exits with an error code of 2 if the service is missing.
+
+    # Required parameters
+
+    - app: a Flask object
+    - service: a string
+
+    # Returned value
+
+    A dictionary.
+    """
+    if definition := app.config['CONTEXT'].get('services', {}).get(service):
+        return definition
+    app.logger.error(
+        '.services.{} specification missing in configuration context.',
+        service,
+    )
+    sys.exit(2)
+
+
+def run_app(app) -> None:
+    """Start the app.
+
+    Using waitress as the wsgi server.  The logging service is
+    configured to only show waitress errors and up messages.
+
+    Access logs are only displayed when in DEBUG mode.
+    """
+    context = app.config['CONTEXT']
+
+    from waitress import serve
+
+    if _get_debug_level(app.name) == 'DEBUG':
+        from paste.translogger import TransLogger
+
+        app = TransLogger(app, format=ACCESSLOG_FORMAT, setup_console_handler=False)
+    else:
+        logging.getLogger('waitress').setLevel('ERROR')
+        app.logger.info(f'Serving on http://{context["host"]}:{context["port"]}')
+
+    serve(app, host=context['host'], port=context['port'])
+
+
 ########################################################################
 ## Misc. helpers
 

opentf/toolkit/__init__.py

@@ -30,6 +30,7 @@ import yaml
 from opentf.commons import (
     make_app,
     run_app,
+    get_context_parameter,
     subscribe,
     unsubscribe,
     EXECUTIONCOMMAND,
@@ -324,18 +325,10 @@ def _watchdog(plugin, polling_delay):
 
 def _start_watchdog(plugin) -> None:
     """Set up a watchdog that monitors specified files for changes."""
-    try:
-        polling_delay = max(
-            WATCHDOG_POLLING_DELAY_SECONDS,
-            int(plugin.config['CONTEXT'].get(WATCHDOG_POLLING_DELAY_KEY, 0)),
-        )
-    except ValueError as err:
-        plugin.logger.error(
-            'Configuration parameter %s not an integer: %s.',
-            WATCHDOG_POLLING_DELAY_KEY,
-            str(err),
-        )
-        sys.exit(2)
+    polling_delay = max(
+        WATCHDOG_POLLING_DELAY_SECONDS,
+        get_context_parameter(plugin, WATCHDOG_POLLING_DELAY_KEY, 0),
+    )
 
     plugin.logger.info('Watchdog configuration:')
     plugin.logger.info(

{opentf_toolkit_nightly-0.50.0.dev650.dist-info → opentf_toolkit_nightly-0.50.0.dev653.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: opentf-toolkit-nightly
-Version: 0.50.0.dev650
+Version: 0.50.0.dev653
 Summary: OpenTestFactory Orchestrator Toolkit
 Home-page: https://gitlab.com/henixdevelopment/open-source/opentestfactory/python-toolkit
 Author: Martin Lafaix

{opentf_toolkit_nightly-0.50.0.dev650.dist-info → opentf_toolkit_nightly-0.50.0.dev653.dist-info}/RECORD

@@ -1,4 +1,4 @@
-opentf/commons/__init__.py,sha256=nik2VTlPwVCiyNl3tcf1I3cTocNP2Dkt7u_P8v6k1ts,18761
+opentf/commons/__init__.py,sha256=DfoMjN4P_PgV37l7HM8qBywGO-r4l0RirKpSXlyz-iE,19986
 opentf/commons/auth.py,sha256=ADMygTSGy6voOQUAD9EtusPR_hgJ6jUK_uJE8CCpBoE,14481
 opentf/commons/config.py,sha256=lvxacmFxxQ8Va0qepx-ld7taCpjOr4l-NjDBOTrzrE4,3510
 opentf/commons/expressions.py,sha256=F8oJgLB0LjqIJOfDHhw2MXY5CQuX7GksJZijY7K-TLc,18982
@@ -42,11 +42,11 @@ opentf/schemas/opentestfactory.org/v1beta1/Workflow.json,sha256=QZ8mM9PhzsI9gTmw
 opentf/schemas/opentestfactory.org/v1beta2/ServiceConfig.json,sha256=rEvK2YWL5lG94_qYgR_GnLWNsaQhaQ-2kuZdWJr5NnY,3517
 opentf/scripts/launch_java_service.sh,sha256=FRYrQD704VWLGXQ3QI-M3m77olXexB0vVEwzyiKLkxc,1579
 opentf/scripts/startup.py,sha256=CjKrFqbLyDKdUca-fWB-QkDURjdypkbrBUpEFNy3qQo,18719
-opentf/toolkit/__init__.py,sha256=s2HZLnfWPIvkfLWboWPT4JwfBNH-8kZd9XMsZ5Tibsk,19303
+opentf/toolkit/__init__.py,sha256=J8lC8gH952aspCnroErgaoqxsDBaNNAgiorfP8c5e3c,19088
 opentf/toolkit/channels.py,sha256=caUaZIRHp9D4BoJRtFug-M6tsjxrp3TDPaBxPlPghos,16121
 opentf/toolkit/core.py,sha256=40S-pUKXWidbI4JwkmQjGq46WlxJshj6d-wEl4e5TxU,7312
-opentf_toolkit_nightly-0.50.0.dev650.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-opentf_toolkit_nightly-0.50.0.dev650.dist-info/METADATA,sha256=IasVxwNNnQywo3hUCejrUZGRKV5Pg6gor2PlW1EneK0,1981
-opentf_toolkit_nightly-0.50.0.dev650.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
-opentf_toolkit_nightly-0.50.0.dev650.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
-opentf_toolkit_nightly-0.50.0.dev650.dist-info/RECORD,,
+opentf_toolkit_nightly-0.50.0.dev653.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+opentf_toolkit_nightly-0.50.0.dev653.dist-info/METADATA,sha256=lXf9Al4eFwdGJ-673DrzSYO8u6UZeF6GT5eFdVDFoUo,1981
+opentf_toolkit_nightly-0.50.0.dev653.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
+opentf_toolkit_nightly-0.50.0.dev653.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
+opentf_toolkit_nightly-0.50.0.dev653.dist-info/RECORD,,