stoobly-agent 1.9.11__py3-none-any.whl → 1.9.12__py3-none-any.whl

stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.9.11'
+VERSION = '1.9.12'

stoobly_agent/app/cli/helpers/shell.py

@@ -1,19 +1,9 @@
-import os
 import subprocess
 import sys
 
-from dotenv import load_dotenv
-
 DOTENV_PATH = 'STOOBLY_DOTENV_PATH'
 
 def exec_stream(command):
-  dotenv_path = os.environ.get(DOTENV_PATH)
-
-  if dotenv_path and os.path.exists(dotenv_path):
-    load_dotenv(dotenv_path=dotenv_path)
-  else:
-    load_dotenv()
-
   # Start the process
   process = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
   

stoobly_agent/app/cli/scaffold/constants.py

@@ -18,6 +18,7 @@ CONFIG_FILE = '.config.yml'
 CONTEXT_DIR_ENV = 'CONTEXT_DIR'
 DOCKER_NAMESPACE = 'docker'
 DOTENV_FILE = '.env'
+DOTENV_PATH_ENV = 'STOOBLY_DOTENV_PATH'
 NAMESERVERS_FILE = '.nameservers'
 PUBLIC_FOLDER_NAME = 'public'
 SERVICE_DETACHED = '${SERVICE_DETACHED}'

stoobly_agent/app/cli/scaffold/workflow_namesapce.py

@@ -1,8 +1,8 @@
 import os
-
+import shutil
 
 from .app import App
-from .constants import DOTENV_FILE, NAMESERVERS_FILE
+from .constants import DOTENV_PATH_ENV, DOTENV_FILE, NAMESERVERS_FILE
 
 class WorkflowNamespace():
 
@@ -35,6 +35,12 @@ class WorkflowNamespace():
   def traefik_config_path(self):
     return os.path.join(self.path, 'traefik.yml')
 
+  def copy_dotenv(self):
+    dotenv_path = os.environ.get(DOTENV_PATH_ENV) or '.env'
+
+    if os.path.isfile(dotenv_path):
+      shutil.copy(dotenv_path, self.dotenv_path)
+
   def traefik_config_relative_path(self, path: str):
     if not path:
       return path

stoobly_agent/app/cli/scaffold_cli.py

@@ -89,7 +89,7 @@ def hostname(ctx):
   help="Scaffold application"
 )
 @click.option('--app-dir-path', default=current_working_dir, help='Path to create the app scaffold.')
-@click.option('--docker-socket-path', default='/var/run/docker.sock', help='Path to Docker socket.')
+@click.option('--docker-socket-path', default='/var/run/docker.sock', type=click.Path(exists=True, file_okay=True, dir_okay=False), help='Path to Docker socket.')
 @click.option('--quiet', is_flag=True, help='Disable log output.')
 @click.option('--ui-port', default=4200, type=click.IntRange(1, 65535), help='UI service port.')
 @click.argument('app_name', callback=validate_app_name)
@@ -339,7 +339,7 @@ def copy(**kwargs):
 @click.option('--service', multiple=True, help='Select which services to log. Defaults to all.')
 @click.option('--user-id', default=os.getuid(), help='OS user ID of the owner of context dir path.')
 @click.argument('workflow_name')
-def down(**kwargs):  
+def down(**kwargs):
   os.environ[env_vars.LOG_LEVEL] = kwargs['log_level']
 
   containerized = kwargs['containerized']
@@ -349,6 +349,7 @@ def down(**kwargs):
   __validate_app(app)
 
   __with_namespace_defaults(kwargs)
+  __with_workflow_namespace(app, kwargs['namespace'])
 
   services = __get_services(
     app, service=kwargs['service'], workflow=[kwargs['workflow_name']]
@@ -503,6 +504,7 @@ def up(**kwargs):
   __validate_app(app)
 
   __with_namespace_defaults(kwargs)
+  workflow_namespace = __with_workflow_namespace(app, kwargs['namespace'])
 
   services = __get_services(
     app, service=kwargs['service'], workflow=[kwargs['workflow_name']]
@@ -514,11 +516,7 @@ def up(**kwargs):
 
   # Gateway ports are dynamically set depending on the workflow run
   workflow = Workflow(kwargs['workflow_name'], app)
-  configure_gateway(
-    WorkflowNamespace(app, kwargs['namespace'] or workflow.workflow_name), 
-    workflow.service_paths_from_services(services), 
-    kwargs['no_publish']
-  )
+  configure_gateway(workflow_namespace, workflow.service_paths_from_services(services), kwargs['no_publish'])
 
   commands: List[WorkflowRunCommand] = []
   for service in services:
@@ -840,3 +838,8 @@ def __workflow_create(app, **kwargs):
     template=kwargs['template'],
     workflow_decorators=workflow_decorators
   )
+
+def __with_workflow_namespace(app: App, namespace: str):
+  workflow_namespace = WorkflowNamespace(app, namespace)
+  workflow_namespace.copy_dotenv()
+  return workflow_namespace

stoobly_agent/app/proxy/mock/eval_fixtures_service.py

@@ -7,7 +7,7 @@ from io import BytesIO
 from mitmproxy.http import Request as MitmproxyRequest
 from requests import Response
 from requests.structures import CaseInsensitiveDict
-from typing import Union
+from typing import Optional, Union
 
 from stoobly_agent.lib.logger import bcolors, Logger
 from stoobly_agent.config.constants.custom_headers import MOCK_FIXTURE_PATH
@@ -62,7 +62,7 @@ def eval_fixtures(request: MitmproxyRequest, **options: Options) -> Union[Respon
   with open(fixture_path, 'rb') as fp:
     response = Response()
 
-    response.status_code = status_code
+    response.status_code = int(status_code)
     response.raw = BytesIO(fp.read()) 
     headers[MOCK_FIXTURE_PATH] = fixture_path
     response.headers = headers
@@ -71,6 +71,11 @@ def eval_fixtures(request: MitmproxyRequest, **options: Options) -> Union[Respon
       content_type = __guess_content_type(fixture_path)
       if content_type:
         response.headers['content-type'] = content_type
+      else:
+        # Default to highest priority accept header
+        content_type = __choose_highest_priority_content_type(request.headers.get('accept'))
+        if content_type:
+          response.headers['content-type'] = content_type
 
     Logger.instance(LOG_ID).debug(f"{bcolors.OKBLUE}Resolved{bcolors.ENDC} fixture {fixture_path}")
 
@@ -125,6 +130,32 @@ def __eval_response_fixtures(request: MitmproxyRequest, response_fixtures: Fixtu
     if path:
       return fixture
 
+def __choose_highest_priority_content_type(accept_header: str) -> Optional[str]:
+    if not accept_header:
+        return None
+
+    types = []
+    for part in accept_header.split(","):
+        media_range = part.strip()
+        if ";" in media_range:
+            mime, *params = media_range.split(";")
+            q = 1.0  # default
+            for param in params:
+                param = param.strip()
+                if param.startswith("q="):
+                    try:
+                        q = float(param[2:])
+                    except ValueError:
+                        q = 0.0  # invalid q values treated as lowest
+        else:
+            mime = media_range
+            q = 1.0
+        types.append((mime.strip(), q))
+
+    # Sort by descending q
+    types.sort(key=lambda x: -x[1])
+    return types[0][0] if types else None
+
 def __parse_accept_header(accept_header):
     types = []
     for item in accept_header.split(","):

stoobly_agent/test/app/proxy/mock/eval_fixtures_service_test.py

@@ -2,6 +2,7 @@ import os
 import pdb
 import pytest
 import requests
+import shutil
 
 from click.testing import CliRunner
 from mitmproxy.http import Request as MitmproxyRequest
@@ -156,6 +157,14 @@ class TestEvalFixturesService():
       assert res != None
       return res
 
+    @pytest.fixture()
+    def public_directory_default_response(self, index_file_path: str, mitmproxy_request: MitmproxyRequest, public_directory: str):
+      path = os.path.join(public_directory, 'index')
+      shutil.move(index_file_path, path)
+      res: requests.Response = eval_fixtures(mitmproxy_request, public_directory_path=public_directory)
+      assert res != None
+      return res
+
     def test_it_sets_contents(
       self, public_directory_response: requests.Response, index_file_contents: str
     ):
@@ -164,5 +173,8 @@ class TestEvalFixturesService():
     def test_it_headers(self, public_directory_response: requests.Response):
       assert public_directory_response.headers['Content-Type'] == 'text/html'
     
-    def test_it_sets_status_code(self,  public_directory_response: requests.Response):
-      assert public_directory_response.status_code == 200
+    def test_it_sets_status_code(self, public_directory_response: requests.Response):
+      assert public_directory_response.status_code == 200
+
+    def test_default_it_headers(self, public_directory_default_response: requests.Response):
+      assert public_directory_default_response.headers['Content-Type'] == 'application/json'

{stoobly_agent-1.9.11.dist-info → stoobly_agent-1.9.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: stoobly-agent
-Version: 1.9.11
+Version: 1.9.12
 Summary: Record, mock, and test HTTP(s) requests. CLI agent for Stoobly
 License: Apache-2.0
 Author: Matt Le

{stoobly_agent-1.9.11.dist-info → stoobly_agent-1.9.12.dist-info}/RECORD

@@ -1,4 +1,4 @@
-stoobly_agent/__init__.py,sha256=T0T5meojgC4kb3-HURdzQoFWyRESweACkhTLNw5Rsnk,45
+stoobly_agent/__init__.py,sha256=xENhASdGvBATXYrZA-vmnaCPLgkr7RjAYnjGsnkvbrc,45
 stoobly_agent/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/api/__init__.py,sha256=ctkB8KR-eXO0SFhj602huHiyvQ3PslFWd8fkcufgrAI,1000
 stoobly_agent/app/api/application_http_request_handler.py,sha256=Vvz53yB0bR7J-QqMAkLlhcZrA4P64ZEN7w8cMbgl6o0,5261
@@ -52,7 +52,7 @@ stoobly_agent/app/cli/helpers/request_synchronize_handler.py,sha256=wawAL8hoZLqO
 stoobly_agent/app/cli/helpers/run_command_service.py,sha256=w9CNDZDj_gxCCXAFFOLONuOVu6_W9f8z1RX3-5RKuTM,731
 stoobly_agent/app/cli/helpers/scenario_facade.py,sha256=nWcycEZBL87OFCCQx85-5QaK0Q9XXk2-RMeC1uef2_Y,3134
 stoobly_agent/app/cli/helpers/schema_builder.py,sha256=-R_oU_d8nPNdNA31WDp8lCh7XpCeazLm_1dl_Kq8DLU,1127
-stoobly_agent/app/cli/helpers/shell.py,sha256=pnztxQjm8kdeVZH40PlTSuiGB_yaSP8PXRS15MoUxtE,838
+stoobly_agent/app/cli/helpers/shell.py,sha256=vnQuv-wvLepcgSIZrz7e4CsL5HuKhAVYfHKF0WuPrgg,633
 stoobly_agent/app/cli/helpers/synchronize_request_service.py,sha256=pwsILyrR6XPBJAIVaato0tRrbCT4z5-FymJgfeWTsVw,6018
 stoobly_agent/app/cli/helpers/tabulate_print_service.py,sha256=d4xtJgn9sueL8nAwOSIyiyzuY1ptsD1wxEdLQe0X2tc,964
 stoobly_agent/app/cli/helpers/test_facade.py,sha256=gRnbjYNxnzPmtvFp2J6TZgxaMSzDjpAWdb79kaFBt_I,2227
@@ -73,7 +73,7 @@ stoobly_agent/app/cli/scaffold/app_config.py,sha256=z4sxZcXZTEoXyUZajUuffuWQN8x8
 stoobly_agent/app/cli/scaffold/app_create_command.py,sha256=HOlXL6Ugid2qHagqDVGl3ksjLKE4WF_3Dji8FoQlpuM,1215
 stoobly_agent/app/cli/scaffold/command.py,sha256=G4Zp647cuviaEXUdcl7Rbx_qQAr0Z_DS7-Y3MWDC1Qc,281
 stoobly_agent/app/cli/scaffold/config.py,sha256=HZU5tkvr3dkPr4JMXZtrJlu2wxxO-134Em6jReFFcq0,688
-stoobly_agent/app/cli/scaffold/constants.py,sha256=VuCpzeGxlFEQuX6WEK5D_4ih8-S-iotwOny458K85_c,2612
+stoobly_agent/app/cli/scaffold/constants.py,sha256=8d0YTcPp78mIVOjLeueJkWU6XzC_KxB8ZaU2B-LuDFs,2652
 stoobly_agent/app/cli/scaffold/containerized_app.py,sha256=dAjn4RwcZV3aEL0POUmrbF_DC-r9h6s1zx7gT2t45v0,175
 stoobly_agent/app/cli/scaffold/docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/docker/app_builder.py,sha256=7z5pk5JKlRDHx2USxY-WurttLyyUkIVYfl34_u1x9dE,501
@@ -202,10 +202,10 @@ stoobly_agent/app/cli/scaffold/workflow_copy_command.py,sha256=wi8qHH_M2e6jXIPuu
 stoobly_agent/app/cli/scaffold/workflow_create_command.py,sha256=-fwsr6_LvGT8BbBWdGY3Qd8cSQhBOSJiMr1r8s2R86w,3390
 stoobly_agent/app/cli/scaffold/workflow_env.py,sha256=shPjoX1SWe7K6pGpZvw2fPVHWd6j_azTe58jvOjGUns,607
 stoobly_agent/app/cli/scaffold/workflow_log_command.py,sha256=Bke4lMOMxuDUFuAx9nlXHbKgYMO4KAg9ASHvjz4aVWc,1372
-stoobly_agent/app/cli/scaffold/workflow_namesapce.py,sha256=DXPCjfY6LAJDHy1ZlKVhVgp2aX97TmQK78lmgzBRN20,968
+stoobly_agent/app/cli/scaffold/workflow_namesapce.py,sha256=VNaZrcqMMeqrzpPGhD9-oaZems1k0ebRc6wR74EvA8c,1170
 stoobly_agent/app/cli/scaffold/workflow_run_command.py,sha256=H9s0F8LaoB7ZLUVXWP6M6yPLYk5IE4JD8qgGXntwtMc,11138
 stoobly_agent/app/cli/scaffold/workflow_validate_command.py,sha256=Uo_yo6rVR1ZR7xpvsQvlH48AyMBVLRupd4G-bRjzm_Q,5584
-stoobly_agent/app/cli/scaffold_cli.py,sha256=v4b8jCopSbCUv8rpPqqeC-NeziqD8mWbiF3nOZWQ77Y,32598
+stoobly_agent/app/cli/scaffold_cli.py,sha256=F93zXk9WNRLfiDJ-9MpMB4My7gAJJVHDvV_fKPLsxdA,32896
 stoobly_agent/app/cli/scenario_cli.py,sha256=3J1EiJOvunkfWrEkOsanw-XrKkOk78ij_GjBlE9p7CE,8229
 stoobly_agent/app/cli/snapshot_cli.py,sha256=1Dw5JgDlmG6vctrawIRO7CdB73vAQk_wRBnPG2lVOrQ,11929
 stoobly_agent/app/cli/trace_cli.py,sha256=K7E-vx3JUcqEDSWOdIOi_AieKNQz7dBfmRrVvKDkzFI,4605
@@ -331,7 +331,7 @@ stoobly_agent/app/proxy/mitmproxy/response_facade.py,sha256=0wCSzUULUhDDV93QXUgz
 stoobly_agent/app/proxy/mock/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/proxy/mock/context.py,sha256=vDo5_3WBL73mVFnsmQWvcxvPg5nWtRJbigSrE3zGc-o,794
 stoobly_agent/app/proxy/mock/custom_not_found_response_builder.py,sha256=0KWB3KFxVrnJOKDaYxm5eoJEccw7IpJZRyUvBX61-8k,697
-stoobly_agent/app/proxy/mock/eval_fixtures_service.py,sha256=sVw8l916ouEBj2ViDtHFjgmEA4tLmZGvBfw8wD1Ab-c,4132
+stoobly_agent/app/proxy/mock/eval_fixtures_service.py,sha256=J5CRp_RePD4cHuy0gtXqhA_8GJqXZL0NC0alT9TkjfU,5225
 stoobly_agent/app/proxy/mock/eval_request_service.py,sha256=A1tcE3wmrC1HwLpz0aRuRw-Nucn0dyHD_yHw5BeQEJU,8146
 stoobly_agent/app/proxy/mock/hashed_request_decorator.py,sha256=h1ma90fdaYI9LBWpMWMqWBz-RjNwI628O4VuS_uUBX4,5061
 stoobly_agent/app/proxy/mock/ignored_components_response_builder.py,sha256=E32_E1eSdmPn2SeM_e1jWnqu4xh5w_SnmOs32Shx99E,501
@@ -718,7 +718,7 @@ stoobly_agent/test/app/models/schemas/.stoobly/settings.yml,sha256=vLwMjweKOdod6
 stoobly_agent/test/app/models/schemas/.stoobly/tmp/options.json,sha256=OTRzarwus48CTrItedXCrgQttJHSEZonEYc7R_knvYg,2212
 stoobly_agent/test/app/models/schemas/request_test.py,sha256=9SF43KXbjO-vMr2uObPJlyLeop_JQstl6Jrh0M1A70c,1116
 stoobly_agent/test/app/proxy/mitmproxy/request_facade_test.py,sha256=sXlzjKVvpORJ8fxEs5Qfc4IC0itTWxqDIzMujGjlW7I,5765
-stoobly_agent/test/app/proxy/mock/eval_fixtures_service_test.py,sha256=LTn7iWtHyNVqezRfM2Uf_BiK4vFnS3hgoaIdrzjkcPk,5739
+stoobly_agent/test/app/proxy/mock/eval_fixtures_service_test.py,sha256=bPKabyNUEiOV_F3RG6tiLmfc71qEw5SiUfhhdmphUxA,6333
 stoobly_agent/test/app/proxy/replay/body_parser_service_test.py,sha256=MTC4a3QxrptHzroHAfgrCEzCZ3Ur0Ijyj9_3k-bG0jQ,1228
 stoobly_agent/test/app/proxy/replay/rewrite_params_service_test.py,sha256=4KVaP48KjCeoZKqY3IdrFAP5Pnb3jO86k8L7ffvz2ZI,3770
 stoobly_agent/test/app/proxy/replay/trace_context_test.py,sha256=y0oBNC89sp3BG8biOBTiaTopk1LtqjThlA4d6BwAHzM,14462
@@ -753,8 +753,8 @@ stoobly_agent/test/mock_data/scaffold/docker-compose-local-service.yml,sha256=1W
 stoobly_agent/test/mock_data/scaffold/index.html,sha256=qJwuYajKZ4ihWZrJQ3BNObV5kf1VGnnm_vqlPJzdqLE,258
 stoobly_agent/test/mock_data/uspto.yaml,sha256=6U5se7C3o-86J4m9xpOk9Npias399f5CbfWzR87WKwE,7835
 stoobly_agent/test/test_helper.py,sha256=m_oAI7tmRYCNZdKfNqISWhMv3e44tjeYViQ3nTUfnos,1007
-stoobly_agent-1.9.11.dist-info/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
-stoobly_agent-1.9.11.dist-info/METADATA,sha256=BhaA2CQUDiNOSEBokPAeKi22VSZyNFl6A8Aqx5oPGUg,3088
-stoobly_agent-1.9.11.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-stoobly_agent-1.9.11.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
-stoobly_agent-1.9.11.dist-info/RECORD,,
+stoobly_agent-1.9.12.dist-info/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
+stoobly_agent-1.9.12.dist-info/METADATA,sha256=NZ_3l89VkM5yyJDF7zXVnpiVKWVZeRXdzT54Km0tj8I,3088
+stoobly_agent-1.9.12.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+stoobly_agent-1.9.12.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
+stoobly_agent-1.9.12.dist-info/RECORD,,