stoobly-agent 1.10.0__py3-none-any.whl → 1.10.1__py3-none-any.whl

stoobly_agent/app/cli/scaffold_cli.py

@@ -12,7 +12,7 @@ from stoobly_agent.app.cli.helpers.shell import exec_stream
 from stoobly_agent.app.cli.scaffold.app import App
 from stoobly_agent.app.cli.scaffold.app_create_command import AppCreateCommand
 from stoobly_agent.app.cli.scaffold.constants import (
-  DOCKER_NAMESPACE, WORKFLOW_CONTAINER_PROXY, WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE
+  SERVICES_NAMESPACE, WORKFLOW_CONTAINER_PROXY, WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE
 )
 from stoobly_agent.app.cli.scaffold.constants import PLUGIN_CYPRESS, PLUGIN_PLAYWRIGHT
 from stoobly_agent.app.cli.scaffold.containerized_app import ContainerizedApp
@@ -98,10 +98,13 @@ def hostname(ctx):
 def create(**kwargs):
   __validate_app_dir(kwargs['app_dir_path'])
 
-  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
+  app = App(kwargs['app_dir_path'], SERVICES_NAMESPACE)
 
-  if not kwargs['quiet'] and os.path.exists(app.scaffold_namespace_path):
-    print(f"{kwargs['app_dir_path']} already exists, updating scaffold maintained files...")
+  if not kwargs['quiet']:
+    if os.path.exists(app.scaffold_namespace_path):
+      print(f"{kwargs['app_dir_path']} already exists, updating scaffold maintained files...")
+    else:
+      print(f"Creating scaffold in {kwargs['app_dir_path']}")
 
   res = AppCreateCommand(app, **kwargs).build()
 
@@ -118,7 +121,7 @@ def create(**kwargs):
 @click.option('--service', multiple=True, help='Select which services to run. Defaults to all.')
 @click.option('--workflow', multiple=True, help='Specify services by workflow(s). Defaults to all.')
 def mkcert(**kwargs):
-  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE, **kwargs)
+  app = App(kwargs['app_dir_path'], SERVICES_NAMESPACE, **kwargs)
   __validate_app(app)
 
   services = __get_services(
@@ -137,7 +140,6 @@ def mkcert(**kwargs):
 @click.option('--local', is_flag=True, help='Specifies upstream service is local. Overrides `--upstream-hostname` option.')
 @click.option('--port', type=click.IntRange(1, 65535), help='Service port.')
 @click.option('--priority', default=5, type=click.FloatRange(1.0, 9.0), help='Determines the service run order. Lower values run first.')
-@click.option('--proxy-mode', type=click.Choice(['regular', 'reverse']), help='Proxy mode can be regular or reverse.')
 @click.option('--quiet', is_flag=True, help='Disable log output.')
 @click.option('--scheme', type=click.Choice(['http', 'https']), help='Defaults to https if hostname is set.')
 @click.option('--upstream-hostname', callback=validate_hostname, help='Upstream service hostname.')
@@ -148,7 +150,7 @@ def mkcert(**kwargs):
 def create(**kwargs):
   __validate_app_dir(kwargs['app_dir_path'])
 
-  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
+  app = App(kwargs['app_dir_path'], SERVICES_NAMESPACE)
   service = Service(kwargs['service_name'], app)
 
   if not kwargs['quiet'] and os.path.exists(service.dir_path):
@@ -168,7 +170,7 @@ def create(**kwargs):
 @click.option('--all', is_flag=True, default=False, help='Display all services including core and user defined services')
 @click.option('--workflow', multiple=True, help='Specify workflow(s) to filter the services by. Defaults to all.')
 def _list(**kwargs):
-  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
+  app = App(kwargs['app_dir_path'], SERVICES_NAMESPACE)
   __validate_app(app)
 
   without_core = not kwargs['all']
@@ -209,7 +211,7 @@ def show(ctx, **kwargs):
 @click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
 @click.argument('service_name')
 def delete(**kwargs):
-  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
+  app = App(kwargs['app_dir_path'], SERVICES_NAMESPACE)
   __validate_app(app)
 
   service = Service(kwargs['service_name'], app)
@@ -230,14 +232,13 @@ def delete(**kwargs):
 @click.option('--name', callback=validate_service_name, type=click.STRING, help='New name of the service to update to.')
 @click.option('--port', type=click.IntRange(1, 65535), help='Service port.')
 @click.option('--priority', type=click.FloatRange(1.0, 9.0), help='Determines the service run order. Lower values run first.')
-@click.option('--proxy-mode', type=click.Choice(['regular', 'reverse']), help='Proxy mode can be regular or reverse.')
 @click.option('--scheme', type=click.Choice(['http', 'https']), help='Defaults to https if hostname is set.')
 @click.option('--upstream-hostname', callback=validate_hostname, help='Upstream service hostname.')
 @click.option('--upstream-port', type=click.IntRange(1, 65535), help='Upstream service port.')
 @click.option('--upstream-scheme', type=click.Choice(['http', 'https']), help='Upstream service scheme.')
 @click.argument('service_name')
 def update(**kwargs):
-  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
+  app = App(kwargs['app_dir_path'], SERVICES_NAMESPACE)
   __validate_app(app)
 
   service = Service(kwargs['service_name'], app)
@@ -257,9 +258,6 @@ def update(**kwargs):
   if kwargs['priority']:
     service_config.priority = kwargs['priority']
 
-  if kwargs['proxy_mode']:
-    service_config.proxy_mode = kwargs['proxy_mode']
-
   if kwargs['scheme']:
     service_config.scheme = kwargs['scheme']
 
@@ -299,7 +297,7 @@ def update(**kwargs):
 def create(**kwargs):
   __validate_app_dir(kwargs['app_dir_path'])
 
-  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE, **kwargs)
+  app = App(kwargs['app_dir_path'], SERVICES_NAMESPACE, **kwargs)
 
   for service_name in kwargs['service']:
     config = { **kwargs }
@@ -325,7 +323,7 @@ def create(**kwargs):
 @click.argument('workflow_name')
 @click.argument('destination_workflow_name')
 def copy(**kwargs):
-  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE, **kwargs)
+  app = App(kwargs['app_dir_path'], SERVICES_NAMESPACE, **kwargs)
 
   for service_name in kwargs['service']:
     config = { **kwargs }
@@ -362,7 +360,7 @@ def down(**kwargs):
   containerized = kwargs['containerized']
 
   app_dir_path = current_working_dir if containerized else kwargs['app_dir_path']
-  app = App(app_dir_path, DOCKER_NAMESPACE, **kwargs)
+  app = App(app_dir_path, SERVICES_NAMESPACE, **kwargs)
   __validate_app(app)
 
   __with_namespace_defaults(kwargs)
@@ -441,7 +439,7 @@ def down(**kwargs):
 def logs(**kwargs):
   os.environ[env_vars.LOG_LEVEL] = kwargs['log_level']
 
-  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
+  app = App(kwargs['app_dir_path'], SERVICES_NAMESPACE)
   __validate_app(app)
 
   __with_namespace_defaults(kwargs)
@@ -517,7 +515,7 @@ def up(**kwargs):
   # Because we are running a docker-compose command which depends on APP_DIR env var
   # when we are running this command within a container, the host's app_dir_path will likely differ
   app_dir_path = current_working_dir if containerized else kwargs['app_dir_path']
-  app = App(app_dir_path, DOCKER_NAMESPACE, **kwargs)
+  app = App(app_dir_path, SERVICES_NAMESPACE, **kwargs)
   __validate_app(app)
 
   __with_namespace_defaults(kwargs)
@@ -528,7 +526,7 @@ def up(**kwargs):
   )
 
   if kwargs['mkcert']:
-    _app = ContainerizedApp(app_dir_path, DOCKER_NAMESPACE) if containerized else app
+    _app = ContainerizedApp(app_dir_path, SERVICES_NAMESPACE) if containerized else app
     __services_mkcert(_app, services)
 
   # Gateway ports are dynamically set depending on the workflow run
@@ -598,7 +596,7 @@ def up(**kwargs):
 @click.option('--app-dir-path', default=current_working_dir, help='Path to validate the app scaffold.')
 @click.argument('workflow_name')
 def validate(**kwargs):
-  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
+  app = App(kwargs['app_dir_path'], SERVICES_NAMESPACE)
   __validate_app(app)
 
   workflow = Workflow(kwargs['workflow_name'], app)
@@ -634,7 +632,7 @@ def validate(**kwargs):
 @click.option('--service', multiple=True, help='Select specific services. Defaults to all.')
 @click.option('--workflow', multiple=True, help='Specify services by workflow(s). Defaults to all.')
 def install(**kwargs):
-  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
+  app = App(kwargs['app_dir_path'], SERVICES_NAMESPACE)
   __validate_app(app)
 
   services = __get_services(
@@ -666,7 +664,7 @@ def install(**kwargs):
 @click.option('--service', multiple=True, help='Select specific services. Defaults to all.')
 @click.option('--workflow', multiple=True, help='Specify services by workflow(s). Defaults to all.')
 def uninstall(**kwargs):
-  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
+  app = App(kwargs['app_dir_path'], SERVICES_NAMESPACE)
   __validate_app(app)
 
   services = __get_services(

stoobly_agent/app/proxy/intercept_settings.py

@@ -280,7 +280,7 @@ class InterceptSettings:
     if self.__headers and custom_headers.REQUEST_ORIGIN in self.__headers:
       return self.__headers[custom_headers.REQUEST_ORIGIN]
 
-    return request_origin.WEB
+    return request_origin.PROXY
 
   def for_response(self):
     self.__for_response = True

stoobly_agent/app/proxy/record/upload_request_service.py

@@ -63,10 +63,7 @@ def upload_request(
         scenario_key=scenario_key
     )
 
-    # If request_origin is WEB, then we are in proxy
-    # This means that we have access to Cache singleton and do not need send a request to update the status
-    sync = intercept_settings.request_origin == request_origin.WEB
-    res = __upload_request_with_body_params(request_model, body_params, sync)
+    res = __upload_request_with_body_params(request_model, body_params)
 
     if intercept_settings.settings.is_debug():
         file_path = __debug_request(flow.request, joined_request.build())
@@ -107,11 +104,11 @@ def upload_staged_request(
 
     return __upload_request_with_body_params(request_model, body_params)
 
-def __upload_request_with_body_params(request_model: RequestModel, body_params: dict, sync=True):
+def __upload_request_with_body_params(request_model: RequestModel, body_params: dict):
     request, status = request_model.create(**body_params)
 
     if status < 400:
-        publish_requests_modified(body_params['project_id'], sync=sync)
+        publish_requests_modified(body_params['project_id'])
 
         return request
 

stoobly_agent/app/proxy/utils/publish_change_service.py

@@ -1,41 +1,35 @@
-import os
 import pdb
+import requests
 import threading
 
-from typing import TypedDict
-
 from stoobly_agent.app.settings import Settings
-from stoobly_agent.config.constants.statuses import REQUESTS_MODIFIED
+from stoobly_agent.config.constants.statuses import REQUESTS_MODIFIED, SETTINGS_MODIFIED
 from stoobly_agent.lib.api.agent_api import AgentApi
 from stoobly_agent.lib.cache import Cache
 from stoobly_agent.lib.logger import Logger
 
-class Options(TypedDict):
-  sync: bool
-
-# Announce that a new request has been created
-def publish_change(status: str, value, **options: Options):
-  if options.get('sync'):
-    return __publish_change_sync(status, value)
+LOG_ID = 'PublishChange'
 
+def publish_settings_modified(value):
+  return __publish_change_sync(SETTINGS_MODIFIED, value)
+ 
+def publish_requests_modified(value):
   settings: Settings = Settings.instance()
 
-  # If ui is not active, return
-  if  not settings.ui.active:
-    return False
+  # If not headless...
+  if settings.ui.active:
+    return __publish_change_sync(REQUESTS_MODIFIED, value)
 
   ui_url = settings.ui.url
-
   if not ui_url:
-    Logger.instance().warn('Settings.ui.url not configured')
     return False
-  else:
-    thread = threading.Thread(target=__put_status, args=(ui_url, status, value))
-    thread.start()
-    return True
 
-def publish_requests_modified(value, **options: Options):
-  return publish_change(REQUESTS_MODIFIED, value, **options)
+  return __publish_change_async(REQUESTS_MODIFIED, value, ui_url)
+
+def __publish_change_async(status, value, ui_url: str):
+  thread = threading.Thread(target=__put_status, args=(ui_url, status, value))
+  thread.start()
+  return True
 
 def __publish_change_sync(status: str, value):
   cache = Cache.instance()
@@ -44,4 +38,7 @@ def __publish_change_sync(status: str, value):
 
 def __put_status(ui_url, status, value):
     api: AgentApi = AgentApi(ui_url)
-    api.update_status(status, value)
+    try:
+      api.update_status(status, value)
+    except requests.exceptions.ConnectionError:
+      Logger.instance(LOG_ID).error(f"could not connect to {ui_url}")

stoobly_agent/app/settings/__init__.py

@@ -8,7 +8,7 @@ from watchdog.observers import Observer
 from watchdog.events import PatternMatchingEventHandler
 from yamale import *
 
-from stoobly_agent.config.constants import env_vars, statuses
+from stoobly_agent.config.constants import env_vars
 from stoobly_agent.config.data_dir import DataDir
 from stoobly_agent.config.source_dir import SourceDir
 from stoobly_agent.lib.logger import Logger
@@ -19,6 +19,7 @@ from .remote_settings import RemoteSettings
 from .ui_settings import UISettings
 
 LOG_ID = 'Settings'
+SETTINGS_YML = 'settings.yml'
 
 class Settings:
     _instances = None
@@ -102,7 +103,7 @@ class Settings:
         if self.__watching:
             return False
 
-        patterns = ['settings.yml']
+        patterns = [SETTINGS_YML]
         ignore_patterns = None
         ignore_directories = False
         case_sensitive = True
@@ -180,11 +181,12 @@ class Settings:
         if not contents:
             return
 
-        path = self.__settings_file_path
-        lock = FileLock(path + ".lock")  # lock file alongside the target
+        lock_file = f".{SETTINGS_YML}.lock"
+        lock_file_path = os.path.join(os.path.dirname(self.__settings_file_path), lock_file)
+        lock = FileLock(lock_file_path)  # lock file alongside the target
 
         with lock:
-            with open(path, 'w') as fp:
+            with open(self.__settings_file_path, 'w') as fp:
                 yaml.dump(contents, fp, allow_unicode=True)
 
     ### Helpers
@@ -215,13 +217,14 @@ class Settings:
 
     def __reload_settings(self, event):
         if not self.__load_lock:
-            from stoobly_agent.app.proxy.utils.publish_change_service import publish_change
+            from stoobly_agent.app.proxy.utils.publish_change_service import publish_settings_modified
 
             self.__load_lock = True
 
             Logger.instance(LOG_ID).debug('Reloading settings')
             self.__load_settings()
 
-            publish_change(statuses.SETTINGS_MODIFIED, self.__settings, sync=True)
+            if self.__ui_settings.active:
+                publish_settings_modified(self.__settings)
 
         self.__load_lock = False

stoobly_agent/config/data_dir.py

@@ -202,6 +202,7 @@ class DataDir:
             with open(os.path.join(self.__data_dir_path, '.gitignore'), 'w') as fp:
                 fp.write(
                     "\n".join([
+                        '.settings.yml.lock',
                         'ca_certs',
                         'certs',
                         'db',

stoobly_agent/public/index.html

@@ -113,6 +113,6 @@
   </div>
 
   <root></root>
-<script src="runtime-es2015.f8c814b38b27708e91c1.js" type="module"></script><script src="runtime-es5.f8c814b38b27708e91c1.js" nomodule="" defer=""></script><script src="polyfills-es5.7530172ddcec11a10eb3.js" nomodule="" defer=""></script><script src="polyfills-es2015.8ce2adc69f283f6c4c5e.js" type="module"></script><script src="main-es2015.089b46f303768fbe864f.js" type="module"></script><script src="main-es5.089b46f303768fbe864f.js" nomodule="" defer=""></script></body>
+<script src="runtime-es2015.f8c814b38b27708e91c1.js" type="module"></script><script src="runtime-es5.f8c814b38b27708e91c1.js" nomodule="" defer=""></script><script src="polyfills-es5.7530172ddcec11a10eb3.js" nomodule="" defer=""></script><script src="polyfills-es2015.8ce2adc69f283f6c4c5e.js" type="module"></script><script src="main-es2015.5a9aa16433404c3f423a.js" type="module"></script><script src="main-es5.5a9aa16433404c3f423a.js" nomodule="" defer=""></script></body>
 
 </html>