stoobly-agent 1.0.3__py3-none-any.whl → 1.0.5__py3-none-any.whl

stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.0.3'
+VERSION = '1.0.5'

stoobly_agent/app/api/__init__.py

@@ -3,28 +3,36 @@ import pdb
 import threading
 
 from http.server import HTTPServer
+from urllib.parse import urlparse
 
 from stoobly_agent.app.settings import Settings
 from stoobly_agent.config.constants import env_vars
+from stoobly_agent.lib.logger import Logger
 
 from .application_http_request_handler import ApplicationHTTPRequestHandler
 
+LOG_ID = 'UI'
+
 def start_server(host, port):
     httpd = HTTPServer((host, port), ApplicationHTTPRequestHandler)
     httpd.serve_forever()
 
-def run(**kwargs):
-    ui_host = kwargs['ui_host']
-    ui_port = kwargs['ui_port']
+def initialize(**kwargs):
     url = f"http://{kwargs['ui_host']}:{kwargs['ui_port']}"
 
     os.environ[env_vars.AGENT_URL] = url
 
+    # TODO: debug why the following is needed or else logger won't print
     settings = Settings.instance()
     settings.ui.url = url
     settings.commit()
 
-    print(f"UI server listening at http://{ui_host}:{ui_port}\n")
+    return url
+
+def run(url):
+    parsed_url = urlparse(url)
+
+    Logger.instance(LOG_ID).info(f"Server listening at {url}\n")
 
-    thread = threading.Thread(target=start_server, args=(ui_host, ui_port))
+    thread = threading.Thread(target=start_server, args=(parsed_url.hostname, parsed_url.port))
     thread.start()

stoobly_agent/app/cli/scaffold/docker/service/builder.py

@@ -2,7 +2,7 @@ import os
 import pdb
 
 from ...app_config import AppConfig
-from ...constants import SERVICE_HOSTNAME, SERVICE_HOSTNAME_ENV, SERVICE_PORT, SERVICE_PORT_ENV, SERVICE_SCHEME, SERVICE_SCHEME_ENV
+from ...constants import SERVICE_HOSTNAME, SERVICE_HOSTNAME_ENV, STOOBLY_HOME_DIR
 from ...service_config import ServiceConfig
 from ..app_builder import AppBuilder
 from ..builder import Builder
@@ -52,6 +52,10 @@ class ServiceBuilder(Builder):
   def proxy_base_service(self):
     return self.services.get(self.proxy_base)
 
+  @property
+  def service_mount(self):
+    return f"{self.dir_path}:{STOOBLY_HOME_DIR}"
+
   @property
   def service_name(self):
     return self.__service_name
@@ -77,7 +81,8 @@ class ServiceBuilder(Builder):
       'extends': {
         'file': os.path.relpath(self.app_builder.compose_file_path, self.dir_path),
         'service': self.app_builder.proxy_base
-      }
+      },
+      'volumes': [self.service_mount]
     })
 
     args[SERVICE_HOSTNAME_ENV] = f"{SERVICE_HOSTNAME}"
@@ -90,7 +95,8 @@ class ServiceBuilder(Builder):
       'extends': {
         'file': os.path.relpath(self.app_builder.compose_file_path, self.dir_path),
         'service': self.app_builder.context_base
-      }
+      },
+      'volumes': [self.service_mount]
     })
 
   def build_configure_base(self):

stoobly_agent/app/cli/scaffold/docker/workflow/builder.py

@@ -124,7 +124,7 @@ class WorkflowBuilder(Builder):
 
   def build_init(self):
     environment = { **self.env_dict() }
-    volumes = [f"{self.service_path}:{STOOBLY_HOME_DIR}"]
+    volumes = []
 
     service = {
       'build': self.context_build,

stoobly_agent/app/cli/scaffold/docker/workflow/mock_decorator.py

@@ -20,7 +20,7 @@ class MockDecorator():
     config = self.service_builder.config
 
     command = [
-      '--certs', f"../{SERVICE_HOSTNAME}-joined.pem",
+      '--certs', f"/etc/ssl/certs/{SERVICE_HOSTNAME}-joined.pem",
       '--headless',
       '--intercept',
       '--lifecycle-hooks-path', 'lifecycle_hooks.py',

stoobly_agent/app/cli/scaffold/docker/workflow/reverse_proxy_decorator.py

@@ -22,7 +22,7 @@ class ReverseProxyDecorator():
     config = self.service_builder.config
 
     command = [
-      '--certs', f"../{SERVICE_HOSTNAME}-joined.pem",
+      '--certs', f"/etc/ssl/certs/{SERVICE_HOSTNAME}-joined.pem",
       '--headless',
       '--lifecycle-hooks-path', 'lifecycle_hooks.py',
       '--proxy-mode', config.proxy_mode,

stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.proxy

@@ -31,5 +31,4 @@ RUN setcap 'cap_net_bind_service=+ep' /usr/local/bin/python3.12
 # Change user id of stoobly user to that of host's user id
 RUN if [ -n "$USER_ID" ]; then groupmod -g $USER_ID stoobly; usermod -u $USER_ID stoobly; fi
 
-COPY --chown=stoobly:stoobly . .
-COPY --chown=stoobly:stoobly --from=cert /home/mkcert/$SERVICE_HOSTNAME-joined.pem .
+COPY --chown=stoobly:stoobly --from=cert /home/mkcert/$SERVICE_HOSTNAME-joined.pem /etc/ssl/certs

stoobly_agent/app/cli/snapshot_cli.py

@@ -32,7 +32,7 @@ def snapshot(ctx):
 @snapshot.command(
   help="Apply snapshots.",
 )
-@click.option('--force', default=False, help="Toggles whether resources are hard deleted.")
+@click.option('--force', is_flag=True, default=False, help="Toggles whether resources are hard deleted.")
 @click.argument('uuid', required=False)
 def apply(**kwargs):
   apply = Apply(force=kwargs['force']).with_logger(print)

stoobly_agent/cli.py

@@ -15,7 +15,7 @@ from stoobly_agent.config.constants import env_vars, mode
 from stoobly_agent.config.data_dir import DataDir
 from stoobly_agent.lib.utils.conditional_decorator import ConditionalDecorator
 
-from .app.api import run as run_api
+from .app.api import initialize as initialize_api, run as run_api
 from .app.cli import ca_cert, config, endpoint, feature, intercept, MainGroup, request, scenario, scaffold, snapshot, trace
 from .app.cli.helpers.feature_flags import local, remote
 from .app.settings import Settings
@@ -144,8 +144,9 @@ def run(**kwargs):
     if 'api_url' in kwargs and kwargs['api_url']:
         os.environ[env_vars.API_URL] = kwargs['api_url']
 
+    url = initialize_api(**kwargs)
     if 'headless' in kwargs and not kwargs['headless']:
-        run_api(**kwargs)
+        run_api(url)
 
     if 'proxyless' in kwargs and not kwargs['proxyless']:
         run_proxy(**kwargs)

stoobly_agent/test/app/models/schemas/.stoobly/db/VERSION

@@ -1 +1 @@
-0.34.13
+1.0.4

{stoobly_agent-1.0.3.dist-info → stoobly_agent-1.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: stoobly-agent
-Version: 1.0.3
+Version: 1.0.5
 Summary: Record, mock, and test HTTP(s) requests. CLI agent for Stoobly
 License: Apache-2.0
 Author: Matt Le
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: click (>=7.0.0,<8.0.0)
+Requires-Dist: click (>=8.1.0,<9.0.0)
 Requires-Dist: diff-match-patch (>=20230430,<20230431)
 Requires-Dist: distro (>=1.6.0,<1.7.0)
 Requires-Dist: dnspython (>=2.6.1,<2.7.0)

{stoobly_agent-1.0.3.dist-info → stoobly_agent-1.0.5.dist-info}/RECORD

@@ -1,6 +1,6 @@
-stoobly_agent/__init__.py,sha256=1iq11Ukg_29inNpGraPlJZyy108NR369Tfe2MmRTotM,44
+stoobly_agent/__init__.py,sha256=6tvkXcNE_sNjUAP2DAWOB3-aEqTtRoqoAFjoATyoFdM,44
 stoobly_agent/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-stoobly_agent/app/api/__init__.py,sha256=FFSlVoTgjPfUNlYPr_7u6-P5Y4WOKyaUfAHtUcB-Xio,810
+stoobly_agent/app/api/__init__.py,sha256=ctkB8KR-eXO0SFhj602huHiyvQ3PslFWd8fkcufgrAI,1000
 stoobly_agent/app/api/application_http_request_handler.py,sha256=jf4fkqjOiCeI2IM5Ro7ie0v_C6y0-7-5TIE_IKMPOfg,5513
 stoobly_agent/app/api/bodies_controller.py,sha256=TmN82Q7OFjWiIszwUzfYHQqsqCwLLrThXcIfQmNgvTo,2285
 stoobly_agent/app/api/configs_controller.py,sha256=wkO3_9cexH7BKwm_2KflKEEdxvBFwc9vju_wouUjjBI,4692
@@ -80,15 +80,15 @@ stoobly_agent/app/cli/scaffold/docker/builder.py,sha256=lNOvDxoLB1L8KSDrvoG4CUuW
 stoobly_agent/app/cli/scaffold/docker/constants.py,sha256=GxHXHC_UzPqSzQ8T5zBu9KtgGVvTWeVUq6gMLzxURg4,276
 stoobly_agent/app/cli/scaffold/docker/service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/docker/service/build_decorator.py,sha256=ZU7z4bkvdS3OK5O4fJhlA9_PNwnFtZW6t7vNF7V5obQ,1003
-stoobly_agent/app/cli/scaffold/docker/service/builder.py,sha256=BLeXl3yFHrcx8RJqsG_3dVfNuwlHzw-fZR3eilJhh8c,3104
+stoobly_agent/app/cli/scaffold/docker/service/builder.py,sha256=jJyC9fpJ0N-s-ALN33WHxzXq5Dwdfoq9enFEAeCwiCc,3221
 stoobly_agent/app/cli/scaffold/docker/service/set_gateway_ports.py,sha256=jvlO5xjATNIp8Gr0yP2O7a68bOK-8cAiKNqRWCFzK1s,1221
 stoobly_agent/app/cli/scaffold/docker/service/types.py,sha256=qB-yYHlu-PZDc0HYgTUvE5bWNpHxaSThC3JUG8okR1k,88
 stoobly_agent/app/cli/scaffold/docker/workflow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/docker/workflow/build_decorator.py,sha256=vbmME0cbN2EnNRlzQ2umj7Y3L7aZT-EHqEpkBFMfe8U,758
-stoobly_agent/app/cli/scaffold/docker/workflow/builder.py,sha256=_ag6YU6uafV2ux5gC4nvxCexoiLSslxsUEyhU47g_o0,6960
+stoobly_agent/app/cli/scaffold/docker/workflow/builder.py,sha256=51uGZt9CydBzRwR9aB6uDXuJ2QNm6Iql3AMWv6AtCtw,6919
 stoobly_agent/app/cli/scaffold/docker/workflow/decorators_factory.py,sha256=Mi6SEFpG2MG9pymPLbPTWBMfosi1ThRAs5DXfjBz4Iw,643
-stoobly_agent/app/cli/scaffold/docker/workflow/mock_decorator.py,sha256=pOvyrauHRB1cOB0OKBA3MQnM-Iwfbuwwop2TDSWs_jo,1067
-stoobly_agent/app/cli/scaffold/docker/workflow/reverse_proxy_decorator.py,sha256=RiNOXaCj_TM-NkFVtu-jnZEIeG8HBKPrVqBbnfRNzio,2031
+stoobly_agent/app/cli/scaffold/docker/workflow/mock_decorator.py,sha256=AOPupyornoGG3FxP5iSEC9bJ_ErlG7qkilIkVxCmARg,1079
+stoobly_agent/app/cli/scaffold/docker/workflow/reverse_proxy_decorator.py,sha256=WTNiegoWNwz_t3WKu5en0XJjmfHHXvcsa8f4BeS8zvE,2043
 stoobly_agent/app/cli/scaffold/env.py,sha256=e-Ve4p3RUgzFx22B3SIYttvJ_yLuDtA27oDACZ8n-6E,1140
 stoobly_agent/app/cli/scaffold/service.py,sha256=HzYTiQGfReYXEY0Iv4YjGpu5fjCicV61Wst4khmmURs,504
 stoobly_agent/app/cli/scaffold/service_command.py,sha256=VtXrgiNO6kD4Oi_alHrJWQhkho3oI-yqs1fe8BPDW6M,1055
@@ -97,7 +97,7 @@ stoobly_agent/app/cli/scaffold/service_create_command.py,sha256=bmLGgx9qnh-X_i2_
 stoobly_agent/app/cli/scaffold/service_workflow.py,sha256=sQ_Edy_wGHKMXpD0DmhnOWkGEKz7gSgEGNI8f7aXOdg,444
 stoobly_agent/app/cli/scaffold/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.context,sha256=1Zm5_ROKZzFMAkMt8dluEJASI2CBi9d9If_Gch9FMNM,193
-stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.proxy,sha256=g4FSTh8tlyweisTO29Ci6c1GsPm154RsE1K4EHRgQkg,1047
+stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.proxy,sha256=JfZOVALEmRE_hVEMIHTmem9Ln32qnfKOAUO1c5Z9fqw,1027
 stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=di-KeT_8vHlz86wqJeEx_jwbJrC3bSK_RHgJCGYrlpg,4114
 stoobly_agent/app/cli/scaffold/templates/app/.docker-compose.base.yml,sha256=jDEG7TkEyHhlt33H5JC-jD0nwdFk2rsDcaS6N9yjYRk,359
 stoobly_agent/app/cli/scaffold/templates/app/Makefile,sha256=t7xRaCc9q3k7W34S0h9KX02GljSVwGpPnFmiLUvWxsw,80
@@ -184,7 +184,7 @@ stoobly_agent/app/cli/scaffold/workflow_log_command.py,sha256=FN-XyMVnulbassBuqe
 stoobly_agent/app/cli/scaffold/workflow_run_command.py,sha256=quPMwahE7TQozbzntIQJRoEhNjv0e_QfpYZnbWQV1iE,4025
 stoobly_agent/app/cli/scaffold_cli.py,sha256=5facvX1S-SnJWWe644_8bBV4ytLQlj25RYDiiselvcU,14765
 stoobly_agent/app/cli/scenario_cli.py,sha256=3J1EiJOvunkfWrEkOsanw-XrKkOk78ij_GjBlE9p7CE,8229
-stoobly_agent/app/cli/snapshot_cli.py,sha256=ngEuNxQPBY9YhoBosPXIQ-vWnZQaivjxeT25ObxJeuI,9951
+stoobly_agent/app/cli/snapshot_cli.py,sha256=XNxpTm5z3bnBGNGI3_XZIif0ypN62WqYfDmShL5fXg4,9965
 stoobly_agent/app/cli/trace_cli.py,sha256=K7E-vx3JUcqEDSWOdIOi_AieKNQz7dBfmRrVvKDkzFI,4605
 stoobly_agent/app/cli/types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/types/output.py,sha256=2wazv56g5IwLQeJCWfJXXAxTB9Y5WH1cKMHbpjbXNeo,439
@@ -391,7 +391,7 @@ stoobly_agent/app/settings/types/remote_settings.py,sha256=4PvEGKULXM0zv29XTDzV7
 stoobly_agent/app/settings/types/ui_settings.py,sha256=BqPy2F32AbODqzi2mp2kRk28QVUydQIwVmvftn46pco,84
 stoobly_agent/app/settings/ui_settings.py,sha256=YDEUMPuJFh0SLHaGz6O-Gpz8nwsunNzeuc-TzO9OUbM,1170
 stoobly_agent/app/settings/url_rule.py,sha256=Qx7YrIpVRSC-4LeNiCAfCtE50Jou4423hojMW-4qUYg,954
-stoobly_agent/cli.py,sha256=xDNIrhEm9SGfRkiKwPMU--h4yac9VDOhitrG2EKXiUs,9855
+stoobly_agent/cli.py,sha256=cZJDCVa7PGGfiqg4GxaYn74-uPtQQAexHeWmGybw3YE,9915
 stoobly_agent/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/config/constants/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/config/constants/alias_resolve_strategy.py,sha256=_R1tVqFnyGxCraVS5-dhSskaDj_X8-NthsY7i_bEt9M,119
@@ -673,7 +673,7 @@ stoobly_agent/test/app/models/factories/resource/local_db/helpers/log_test.py,sh
 stoobly_agent/test/app/models/factories/resource/local_db/helpers/tiebreak_scenario_request_test.py,sha256=5IFGVGn3ogvRT0fzZgXzhrYlSfSlr8IR1p_XExaegMQ,3399
 stoobly_agent/test/app/models/factories/resource/local_db/request_adapter_test.py,sha256=Pzq1cBPnP9oSWG-p0c-VoymoHxgp483QmNwmV1b78RA,8453
 stoobly_agent/test/app/models/factories/resource/local_db/response_adapter_test.py,sha256=9P95EKH5rZGOrmRkRIDlQZqtiLJHk9735og18Ffwpfw,2204
-stoobly_agent/test/app/models/schemas/.stoobly/db/VERSION,sha256=Cw7nB9g9WecHL96YzKdKia8g8ZLn5FeIOwSOTWh6z5w,8
+stoobly_agent/test/app/models/schemas/.stoobly/db/VERSION,sha256=rqWtvvV0eFJzxPOcG3aHz4AZk-DLa_Z4GkFonk7bsgw,5
 stoobly_agent/test/app/models/schemas/.stoobly/db/stoobly_agent.sqlite3,sha256=ch8gNx6zIelLKQx65gwFx_LRNqUD3EC5xcHZ0ukIQiU,188416
 stoobly_agent/test/app/models/schemas/.stoobly/settings.yml,sha256=vLwMjweKOdod6tSLtIlyBefPQuNXq9wio4kBaODKtAU,726
 stoobly_agent/test/app/models/schemas/.stoobly/tmp/options.json,sha256=OTRzarwus48CTrItedXCrgQttJHSEZonEYc7R_knvYg,2212
@@ -707,8 +707,8 @@ stoobly_agent/test/mock_data/petstore.yaml,sha256=CCdliJky04Az4FIOkFA883uunwFDHL
 stoobly_agent/test/mock_data/request_show_response.py,sha256=K_a0fP0QT58T8sX9PaM6hqtX1A1depZsqg_GsNPf--k,707
 stoobly_agent/test/mock_data/uspto.yaml,sha256=6U5se7C3o-86J4m9xpOk9Npias399f5CbfWzR87WKwE,7835
 stoobly_agent/test/test_helper.py,sha256=m_oAI7tmRYCNZdKfNqISWhMv3e44tjeYViQ3nTUfnos,1007
-stoobly_agent-1.0.3.dist-info/LICENSE,sha256=8QKGyy45eN76Zk52h8gu1DKX2B_gbWgZ3nzDLofEbaE,548
-stoobly_agent-1.0.3.dist-info/METADATA,sha256=0IOpmMNWBtj6URpoxACy1qBi7Eor96-8OwCvJ4aHHQY,3388
-stoobly_agent-1.0.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-stoobly_agent-1.0.3.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
-stoobly_agent-1.0.3.dist-info/RECORD,,
+stoobly_agent-1.0.5.dist-info/LICENSE,sha256=8QKGyy45eN76Zk52h8gu1DKX2B_gbWgZ3nzDLofEbaE,548
+stoobly_agent-1.0.5.dist-info/METADATA,sha256=7Hn3-8EPo9N8ga1KnlMEpJGDs45MwJWS8NaJWe28rgE,3388
+stoobly_agent-1.0.5.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+stoobly_agent-1.0.5.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
+stoobly_agent-1.0.5.dist-info/RECORD,,