stoobly-agent 0.27.0__py3-none-any.whl → 0.27.1__py3-none-any.whl

stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '0.27.0'
+VERSION = '0.27.1'

stoobly_agent/app/api/configs_controller.py

@@ -73,7 +73,7 @@ class ConfigsController:
         scenario_uuid = ScenarioKey(scenario_key).id if scenario_key else None
 
         if scenario_uuid:
-            model = self.__scenario_model(settings)
+            model = self.__scenario_model(context, settings)
             scenario, status = model.show(scenario_uuid)
 
             if status == 404:
@@ -117,7 +117,7 @@ class ConfigsController:
             status = 200
         )
 
-    def __scenario_model(self, context: SimpleHTTPRequestHandler):
-        scenario_model = ScenarioModel(Settings.instance())
+    def __scenario_model(self, context: SimpleHTTPRequestHandler, settings: Settings = None):
+        scenario_model = ScenarioModel(settings or Settings.instance())
         scenario_model.as_remote() if context.headers.get('access-token') else scenario_model.as_local()
         return scenario_model

stoobly_agent/app/models/factories/resource/local_db/request_adapter.py

@@ -35,11 +35,14 @@ class LocalDBRequestAdapter(LocalDBAdapter):
     self.__scenario_orm: Scenario = scenario_orm
 
   def create(self, **params: RequestCreateParams) -> Tuple[RequestShowResponse, int]:
+    self.__adapt_scenario_id(params)
+
     flow: MitmproxyHTTPFlow = params['flow']
     joined_request: JoinedRequest = params['joined_request']
+    scenario_id = params.get('scenario_id')
 
     with ORM.instance().db.transaction():
-      request_columns = build_request_columns(flow, joined_request, scenario_id=params.get('scenario_id'))
+      request_columns = build_request_columns(flow, joined_request, scenario_id=scenario_id)
       request_record = self.__request_orm.create(**request_columns)
 
       response_columns = {
@@ -90,15 +93,9 @@ class LocalDBRequestAdapter(LocalDBAdapter):
 
     return ORMToRequestsResponseTransformer(response_record).transform()
 
-  def __scenario_id(self, scenario_id):
-    if not self.validate_uuid(scenario_id):
-      return scenario_id
-    else:
-      scenario = Scenario.find_by(uuid=scenario_id)
-      if scenario:
-        return scenario.id
-
   def index(self, **query_params: RequestsIndexQueryParams) -> Tuple[RequestsIndexResponse, int]:
+    self.__adapt_scenario_id(query_params)
+
     scenario_id = query_params.get('scenario_id')
     page = int(query_params.get('page') or 0)
     query = query_params.get('q')
@@ -115,7 +112,7 @@ class LocalDBRequestAdapter(LocalDBAdapter):
     if unassigned:
       requests = requests.where('scenario_id', None)
     elif scenario_id: 
-      requests = requests.where('scenario_id', self.__scenario_id(scenario_id))
+      requests = requests.where('scenario_id', scenario_id)
       sort_order = query_params.get('sort_order') or 'asc' 
 
     if starred:
@@ -268,15 +265,30 @@ class LocalDBRequestAdapter(LocalDBAdapter):
 
     return candidates.get()
 
+  def __filter_request_response_columns(self, request_columns: RequestCreateParams):
+    if request_columns.get('project_id'):
+      del request_columns['project_id']
+
   def __request(self, request_id: str):
     if self.validate_uuid(request_id):
       return self.__request_orm.find_by(uuid=request_id)
     else:
       return self.__request_orm.find(request_id)
 
-  def __filter_request_response_columns(self, request_columns: RequestCreateParams):
-    if request_columns.get('project_id'):
-      del request_columns['project_id']
+  def __request_not_found(self):
+    return self.not_found('Request not found')
+
+  def __adapt_scenario_id(self, params: dict):
+    if not params.get('scenario_id'):
+      return
+
+    scenario_id = params['scenario_id']  
+    if not self.validate_uuid(scenario_id):
+      return
+
+    scenario = self.__scenario_orm.find_by(uuid=scenario_id)
+    if scenario:
+      params['scenario_id'] = scenario.id
 
   def __search(self, base_model: Request, query: str) -> Request:
     uri = urlparse(query)
@@ -285,8 +297,4 @@ class LocalDBRequestAdapter(LocalDBAdapter):
       return base_model.where('host', uri.hostname).where('path', uri.path)
     else:
       pattern = f"%{query}%"
-      return base_model.where('path', 'like', pattern).or_where('host', 'like', pattern)
-
-  def __request_not_found(self):
-    return self.not_found('Request not found')
-
+      return base_model.where('path', 'like', pattern).or_where('host', 'like', pattern)

{stoobly_agent-0.27.0.dist-info → stoobly_agent-0.27.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: stoobly-agent
-Version: 0.27.0
+Version: 0.27.1
 Summary: Client agent for Stoobly
 Home-page: https://github.com/Stoobly/stoobly-agent
 Author: Michael Yen

{stoobly_agent-0.27.0.dist-info → stoobly_agent-0.27.1.dist-info}/RECORD

@@ -1,11 +1,11 @@
-stoobly_agent/__init__.py,sha256=R-clxhZjU6bto09MKdAkSvHd-9aoBkS2zfxD4h7xcyI,45
+stoobly_agent/__init__.py,sha256=kFiJrLBzxHGSITxTKDsvWb2qkxWKJeCc7nMfIA9HqQA,45
 stoobly_agent/cli.py,sha256=xymuwIHwTv27d4y-LA3m5ydTyUGoZURLa5cQ0BreSF4,7228
 stoobly_agent/mock.py,sha256=P9cr9yW8PF1XolPfNSftcJVn1xEqcD-SEyIROsFxY20,2549
 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/application_http_request_handler.py,sha256=jf4fkqjOiCeI2IM5Ro7ie0v_C6y0-7-5TIE_IKMPOfg,5513
 stoobly_agent/app/api/bodies_controller.py,sha256=8rndzP1Ema3TkmGwezqNCTzhAIVuMvZjtwSYW4-VPgM,2296
-stoobly_agent/app/api/configs_controller.py,sha256=TTBAMtS-J46dfa_Rag4tK1G2LVNIUeLYjxQajLtcr48,4284
+stoobly_agent/app/api/configs_controller.py,sha256=FgX5v_8T1GKtt4zwDWWDxNn4s7vPA0pcEqjnvVLHKRw,4332
 stoobly_agent/app/api/headers_controller.py,sha256=TNuYxs5oIsnPFM38kAuL6bzCJ6bwGOuKsfEokr1vdXI,2798
 stoobly_agent/app/api/proxy_controller.py,sha256=sdJE2bIQfZmOd8_W-sOMwU2rCS2cxpTVLfgXy8SU1Ck,3761
 stoobly_agent/app/api/query_params_controller.py,sha256=jJwz3KRpuhMNj9oReHUh0TeS0R_Lz6JVMSg8efPndgA,3665
@@ -118,7 +118,7 @@ stoobly_agent/app/models/factories/resource/local_db/local_db_adapter.py,sha256=
 stoobly_agent/app/models/factories/resource/local_db/orm_request_builder.py,sha256=4UjFY26ln2Drlg71R4AKY5vUZYbQ28HYQolJv3SBDqE,1581
 stoobly_agent/app/models/factories/resource/local_db/query_param_adapter.py,sha256=fWtAGcaINMIM5pP0g19o8WUYa7xEMUguFesiqKJyn5A,3966
 stoobly_agent/app/models/factories/resource/local_db/replayed_response_adapter.py,sha256=vUN9ARmRVrxKHpyzWB5w-XX-quOBMFpWOKkyBxTn6mM,3634
-stoobly_agent/app/models/factories/resource/local_db/request_adapter.py,sha256=TtWfOo_Q1Fno8R9I2PJfQpCcrl_f962vu21_gt4Zd5Y,10529
+stoobly_agent/app/models/factories/resource/local_db/request_adapter.py,sha256=25Yw7AK8R-iiQy5FfqvGaOoZWHQOEvaTnM8KzjEsN-k,10721
 stoobly_agent/app/models/factories/resource/local_db/response_adapter.py,sha256=g2plyjBm5NUu1W6SVZavM2PgUYW_DuynFt_MREFhPVI,3228
 stoobly_agent/app/models/factories/resource/local_db/response_header_adapter.py,sha256=lSehvihNQgX6moFY0XLDyLkTeEweCRAwQ16QSdPsvEg,3070
 stoobly_agent/app/models/factories/resource/local_db/scenario_adapter.py,sha256=2BjONMOdhHwfEScXUwta86RuMQHZR2shWImiEMAHUO0,3964
@@ -476,9 +476,9 @@ stoobly_agent/test/app/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 stoobly_agent/test/mock_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/test/mock_data/endpoint_show_response.py,sha256=JFEkceHI6nH38zitCbFMozE1lODahxmvj70N5eM_sec,5901
 stoobly_agent/test/mock_data/request_show_response.py,sha256=K_a0fP0QT58T8sX9PaM6hqtX1A1depZsqg_GsNPf--k,707
-stoobly_agent-0.27.0.dist-info/LICENSE,sha256=8WuxPI7sA6w_Yhwqn6v6Ch2Kvu6fo0cwMNIgxSE7oq8,548
-stoobly_agent-0.27.0.dist-info/METADATA,sha256=u9hoJl1J63vA1beGcaKjgZflXSBI8cXAMaYyaJp6ndY,833
-stoobly_agent-0.27.0.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-stoobly_agent-0.27.0.dist-info/entry_points.txt,sha256=4fpF9D1sN3q8Z6d0MmNAKUy0dz-ZxoH9mqfYMhErRCg,57
-stoobly_agent-0.27.0.dist-info/top_level.txt,sha256=fTxn372sBnUMXVSJxpaVAMBWB3HU3_Mq-WXJCM6mMj8,14
-stoobly_agent-0.27.0.dist-info/RECORD,,
+stoobly_agent-0.27.1.dist-info/LICENSE,sha256=8WuxPI7sA6w_Yhwqn6v6Ch2Kvu6fo0cwMNIgxSE7oq8,548
+stoobly_agent-0.27.1.dist-info/METADATA,sha256=vNC9HPgiyiKsGtqjLVIxpFQXyPZF5hR1eFz_XRIQVGQ,833
+stoobly_agent-0.27.1.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+stoobly_agent-0.27.1.dist-info/entry_points.txt,sha256=4fpF9D1sN3q8Z6d0MmNAKUy0dz-ZxoH9mqfYMhErRCg,57
+stoobly_agent-0.27.1.dist-info/top_level.txt,sha256=fTxn372sBnUMXVSJxpaVAMBWB3HU3_Mq-WXJCM6mMj8,14
+stoobly_agent-0.27.1.dist-info/RECORD,,