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

stoobly_agent/__init__.py

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

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/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-1.0.3.dist-info → stoobly_agent-1.0.4.dist-info}/METADATA

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

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

@@ -1,6 +1,6 @@
-stoobly_agent/__init__.py,sha256=1iq11Ukg_29inNpGraPlJZyy108NR369Tfe2MmRTotM,44
+stoobly_agent/__init__.py,sha256=f1FfF5ji8VyTsfUz9vkoZmCunEPoXdrww6rk9uifrKo,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
@@ -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
@@ -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.4.dist-info/LICENSE,sha256=8QKGyy45eN76Zk52h8gu1DKX2B_gbWgZ3nzDLofEbaE,548
+stoobly_agent-1.0.4.dist-info/METADATA,sha256=Kmm6NvSM_24nSEOEQ65tHBzXE4UB3qMO9dwClO_Qk9o,3388
+stoobly_agent-1.0.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+stoobly_agent-1.0.4.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
+stoobly_agent-1.0.4.dist-info/RECORD,,