stoobly-agent 0.26.11__tar.gz → 0.27.1__tar.gz

{stoobly-agent-0.26.11/stoobly_agent.egg-info → stoobly-agent-0.27.1}/PKG-INFO

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

{stoobly-agent-0.26.11 → stoobly-agent-0.27.1}/stoobly_agent/__init__.py

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

{stoobly-agent-0.26.11 → stoobly-agent-0.27.1}/stoobly_agent/app/api/configs_controller.py

@@ -2,14 +2,14 @@ import pdb
 
 from mergedeep import merge
 
+from stoobly_agent.app.api.simple_http_request_handler import SimpleHTTPRequestHandler
 from stoobly_agent.app.cli.helpers.handle_config_update_service import context as handle_context, handle_project_update, handle_policy_update, handle_scenario_update
-from stoobly_agent.app.settings import Settings
+from stoobly_agent.app.models.scenario_model import ScenarioModel
 from stoobly_agent.app.proxy.intercept_settings import InterceptSettings
-from stoobly_agent.config.constants import mode, replay_policy
-from stoobly_agent.config.constants import mock_policy, record_policy
+from stoobly_agent.app.settings import Settings
+from stoobly_agent.config.constants import mock_policy, mode, record_policy, replay_policy
 from stoobly_agent.lib.api.keys.project_key import ProjectKey
 from stoobly_agent.lib.api.keys.scenario_key import ScenarioKey
-from stoobly_agent.lib.api.scenarios_resource import ScenariosResource
 
 class ConfigsController:
     _instance = None
@@ -67,17 +67,20 @@ class ConfigsController:
         project_id = ProjectKey(project_key).id if project_key else None
                 
         scenario_key = intercept_settings.scenario_key
-        scenario_id = ScenarioKey(scenario_key).id if scenario_key else None
+        scenario_id = None
 
         # Check to make sure the scenario still exists
-        if self.is_remote_enabled(context) and scenario_id:
-            resource = ScenariosResource(settings.remote.api_url, settings.remote.api_key)
-            res = resource.show(scenario_id)
+        scenario_uuid = ScenarioKey(scenario_key).id if scenario_key else None
+
+        if scenario_uuid:
+            model = self.__scenario_model(context, settings)
+            scenario, status = model.show(scenario_uuid)
 
-            if not res.ok and res.status_code == 404:
-                scenario_id = None
+            if status == 404:
                 intercept_settings.scenario_key = None
                 settings.commit()
+            elif status == 200:
+                scenario_id = scenario['id']
 
         modes = [mode.RECORD, mode.MOCK, mode.TEST, mode.REPLAY] if not context.params.get('agent') else [mode.RECORD, mode.MOCK, mode.REPLAY]
 
@@ -114,5 +117,7 @@ class ConfigsController:
             status = 200
         )
 
-    def is_remote_enabled(self, context):
-        return context.headers.get('access-token')
+    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-0.26.11 → stoobly-agent-0.27.1}/stoobly_agent/app/cli/helpers/print_service.py

@@ -24,7 +24,9 @@ def print_projects(projects, **kwargs):
 def print_requests(requests, **kwargs):
     tabulate_print(
       requests, 
-      filter=['components' , 'created_at', 'endpoint', 'endpoint_id', 'id', 'position', 'project_id', 'scenario_id', 'scheme', 'starred', 'updated_at', 'url'],
+      filter=[
+        'body_params_hash', 'body_text_hash', 'components' , 'created_at', 'endpoint', 'endpoint_id', 'http_version', 'is_deleted', 'position', 'project_id', 'pushed_at', 'query_params_hash', 'scenario_id', 'scheme', 'starred', 'uuid', 'updated_at', 'url'
+      ],
       headers=not kwargs.get('without_headers'),
       select=kwargs.get('select') or []
     )
@@ -32,7 +34,7 @@ def print_requests(requests, **kwargs):
 def print_scenarios(scenarios, **kwargs):
     tabulate_print(
         scenarios, 
-        filter=['created_at', 'priority', 'project_id', 'starred', 'updated_at'],
+        filter=['created_at', 'is_deleted', 'priority', 'project_id', 'starred', 'uuid', 'updated_at'],
         headers=not kwargs.get('without_headers'),
         select=kwargs.get('select') or []
     )

{stoobly-agent-0.26.11 → stoobly-agent-0.27.1}/stoobly_agent/app/models/factories/resource/local_db/helpers/create_request_columns_service.py

@@ -20,7 +20,7 @@ def build_request_columns(flow: MitmproxyHTTPFlow, joined_request: JoinedRequest
     'is_deleted': params.get('is_deleted') or False,
     'latency': joined_request.response_string.latency,
     'raw': joined_request.request_string.get(),
-    'scenario_id': int(params['scenario_id']) if params.get('scenario_id') else None,
+    'scenario_id': params['scenario_id'] if params.get('scenario_id') else None,
     'status': flow.response.status_code,
     'uuid': joined_request.request_string.request_id,
   }

{stoobly-agent-0.26.11 → stoobly-agent-0.27.1}/stoobly_agent/app/models/factories/resource/local_db/request_adapter.py

@@ -13,6 +13,7 @@ from stoobly_agent.app.proxy.record.joined_request import JoinedRequest
 from stoobly_agent.lib.orm import ORM
 from stoobly_agent.lib.orm.request import Request
 from stoobly_agent.lib.orm.response import Response
+from stoobly_agent.lib.orm.scenario import Scenario
 from stoobly_agent.lib.orm.transformers.orm_to_stoobly_request_transformer import ORMToStooblyRequestTransformer
 from stoobly_agent.lib.orm.types.request_columns import RequestColumns
 from stoobly_agent.lib.orm.transformers import ORMToRequestTransformer, ORMToRequestsResponseTransformer
@@ -28,16 +29,20 @@ class LocalDBRequestAdapter(LocalDBAdapter):
   __request_orm = None
   __response_orm = None
 
-  def __init__(self, request_orm: Request.__class__ = Request, response_orm: Response.__class__ = Response):
+  def __init__(self, request_orm: Request.__class__ = Request, response_orm: Response.__class__ = Response, scenario_orm = Scenario.__class__):
     self.__request_orm: Request = request_orm
     self.__response_orm: Response = response_orm
+    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 = {
@@ -89,6 +94,8 @@ class LocalDBRequestAdapter(LocalDBAdapter):
     return ORMToRequestsResponseTransformer(response_record).transform()
 
   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')
@@ -105,7 +112,7 @@ class LocalDBRequestAdapter(LocalDBAdapter):
     if unassigned:
       requests = requests.where('scenario_id', None)
     elif scenario_id: 
-      requests = requests.where('scenario_id', int(scenario_id))
+      requests = requests.where('scenario_id', scenario_id)
       sort_order = query_params.get('sort_order') or 'asc' 
 
     if starred:
@@ -258,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)
@@ -275,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.26.11 → stoobly-agent-0.27.1}/stoobly_agent/app/proxy/record/overwrite_scenario_service.py

@@ -31,7 +31,7 @@ def overwrite_scenario(scenario_key: str):
     return 
 
   requests_model = RequestModel(settings)
-  res, status = requests_model.destroy_all(scenario_id=scenario_key.id)
+  res, status = requests_model.destroy_all(scenario_id=scenario['id'])
 
   if status != 200:
     return

{stoobly-agent-0.26.11 → stoobly-agent-0.27.1}/stoobly_agent/lib/api/keys/request_key.py

@@ -1,14 +1,18 @@
-from .resource_key import ResourceKey
+import uuid
+
+from .uuid_key import UuidKey
 
 from stoobly_agent.app.settings import Settings
 
 class InvalidRequestKey(Exception):
   pass
 
-class RequestKey(ResourceKey):
+class RequestKey(UuidKey):
   def __init__(self, key: str):
     super().__init__(key)
 
+    self.__raw = key
+
     if not self.id:
       raise InvalidRequestKey('Missing id')
 
@@ -19,15 +23,20 @@ class RequestKey(ResourceKey):
     
   @property
   def id(self) -> str:
-    return self.get('i')
+    u = uuid.UUID(self.get('i'))
+    return str(u)
     
   @property
   def project_id(self) -> str:
     return self.get('p')
 
+  @property
+  def raw(self):
+    return self.__raw
+
   @staticmethod
   def encode(project_id: str, request_id: str):
-    return ResourceKey.encode({
+    return UuidKey.encode({
       'p': project_id,
-      'i': request_id,
+      'i': request_id.replace('-', ''),
     })

{stoobly-agent-0.26.11 → stoobly-agent-0.27.1}/stoobly_agent/lib/api/keys/scenario_key.py

@@ -1,13 +1,17 @@
-from .resource_key import ResourceKey
+import uuid
+
+from .uuid_key import UuidKey
 
 class InvalidScenarioKey(Exception):
   pass
 
-class ScenarioKey(ResourceKey):
+class ScenarioKey(UuidKey):
 
   def __init__(self, key: str):
     super().__init__(key)
 
+    self.__raw = key
+
     if not self.id:
       raise InvalidScenarioKey('Missing id')
 
@@ -20,11 +24,16 @@ class ScenarioKey(ResourceKey):
 
   @property
   def id(self) -> str:
-    return self.get('i')
+    u = uuid.UUID(self.get('i'))
+    return str(u)
+
+  @property
+  def raw(self):
+    return self.__raw
 
   @staticmethod
   def encode(project_id: str, request_id: str):
-    return ResourceKey.encode({
+    return UuidKey.encode({
       'p': project_id,
-      'i': request_id,
+      'i': request_id.replace('-', ''),
     })

stoobly-agent-0.27.1/stoobly_agent/lib/api/keys/uuid_key.py

@@ -0,0 +1,24 @@
+from .resource_key import ResourceKey
+
+DELIMITTER = '.'
+
+class UuidKey(ResourceKey):
+  def __init__(self, key: str):
+    super().__init__(super().encode(self.__decode(key)))
+
+  @staticmethod
+  def encode(d: dict):
+    toks = []
+    for key in d:
+      toks.append(f"{key}{d[key]}")
+
+    return DELIMITTER.join(toks)
+
+  def __decode(self, key: str):
+    toks = key.split(DELIMITTER)
+
+    d = {}
+    for tok in toks:
+      d[tok[0]] = tok[1:]
+
+    return d

{stoobly-agent-0.26.11 → stoobly-agent-0.27.1}/stoobly_agent/lib/orm/request.py

@@ -52,7 +52,7 @@ class Request(Base):
     return Scenario
 
   def key(self):
-    return decode(RequestKey.encode(LOCAL_PROJECT_ID, self.id))
+    return decode(RequestKey.encode(LOCAL_PROJECT_ID, self.uuid))
 
   # Override
   def to_dict(self):
@@ -96,6 +96,16 @@ def handle_saving(request):
   if hasattr(request, 'is_deleted') and request.is_deleted:
     request.scenario_id = None
 
+  if hasattr(request, 'scenario_id') and request.scenario_id:
+    try:
+      # If set as uuid, convert to id
+      uuid.UUID(request.scenario_id) 
+
+      scenario = Scenario.find_by(uuid=request.scenario_id)
+      request.scenario_id = scenario.id
+    except Exception:
+      pass
+
 def handle_saved(request):
   request_before = request.get_original()
 

{stoobly-agent-0.26.11 → stoobly-agent-0.27.1}/stoobly_agent/lib/orm/scenario.py

@@ -17,7 +17,7 @@ class Scenario(Base):
     return Request
 
   def key(self):
-    return ScenarioKey.encode(LOCAL_PROJECT_ID, self.id).decode()
+    return ScenarioKey.encode(LOCAL_PROJECT_ID, self.uuid)
 
   # Override
   def to_dict(self):