stoobly-agent 0.34.10__py3-none-any.whl → 0.34.12__py3-none-any.whl

stoobly_agent/lib/api/requests_resource.py

@@ -5,6 +5,8 @@ from ..logger import Logger
 from .interfaces import RequestCreateParams, RequestsIndexQueryParams, RequestShowQueryParams
 from .stoobly_api import StooblyApi
 
+LOG_ID = 'RequestsResource'
+
 class RequestsResource(StooblyApi):
 
   def create(self, **body_params: RequestCreateParams):
@@ -22,14 +24,14 @@ class RequestsResource(StooblyApi):
   def index(self, **query_params: RequestsIndexQueryParams):
     url = f"{self.service_url}{self.REQUESTS_ENDPOINT}"
 
-    Logger.instance().debug(f"{self.LOG_ID}.request_response:{url}?{urllib.parse.urlencode(query_params)}")
+    Logger.instance(LOG_ID).debug(f"{url}?{urllib.parse.urlencode(query_params)}")
 
     return self.get(url, headers=self.default_headers, params=query_params)
 
   def response(self, **query_params):
     url = f"{self.service_url}{self.REQUESTS_ENDPOINT}/response"
 
-    Logger.instance().debug(f"{self.LOG_ID}.request_response:{url}?{urllib.parse.urlencode(query_params)}")
+    Logger.instance(LOG_ID).debug(f"{url}?{urllib.parse.urlencode(query_params)}")
 
     return self.get(
         url,
@@ -42,7 +44,7 @@ class RequestsResource(StooblyApi):
   def show(self, request_id, **query_params: RequestShowQueryParams):
       url = f"{self.service_url}{self.REQUESTS_ENDPOINT}/{request_id}"
 
-      Logger.instance().debug(f"{self.LOG_ID}.request_response:{url}?{urllib.parse.urlencode(query_params)}")
+      Logger.instance(LOG_ID).debug(f"{url}?{urllib.parse.urlencode(query_params)}")
 
       return self.get(url, headers=self.default_headers, params=query_params)
 

stoobly_agent/lib/api/response_header_names_resource.py

@@ -7,6 +7,8 @@ from stoobly_agent.app.models.types import HeaderNameCreateParams
 from ..logger import Logger
 from .endpoints_resource import EndpointsResource
 
+LOG_ID = 'ResponseHeaderNamesResource'
+
 class ResponseHeaderNamesResource(EndpointsResource):
   RESPONSE_HEADER_NAME_ENDPOINT = 'response_header_names'
 
@@ -17,20 +19,20 @@ class ResponseHeaderNamesResource(EndpointsResource):
   def index(self, endpoint_id: int, query_params = {}) -> requests.Response:
     url = f"{self.service_url}/{self.ENDPOINTS_ENDPOINT}/{endpoint_id}/{self.RESPONSE_HEADER_NAME_ENDPOINT}"
 
-    Logger.instance().debug(f"{self.LOG_ID}.request_response:{url}?{urllib.parse.urlencode(query_params)}")
+    Logger.instance(LOG_ID).debug(f"{url}?{urllib.parse.urlencode(query_params)}")
 
     return self.get(url, headers=self.default_headers, params=query_params)
 
   def show(self, endpoint_id: int, response_header_name_id: int, query_params = {}) -> requests.Response:
     url = f"{self.service_url}/{self.ENDPOINTS_ENDPOINT}/{endpoint_id}/{self.RESPONSE_HEADER_NAME_ENDPOINT}/{response_header_name_id}"
 
-    Logger.instance().debug(f"{self.LOG_ID}.request_response:{url}?{urllib.parse.urlencode(query_params)}")
+    Logger.instance(LOG_ID).debug(f"{url}?{urllib.parse.urlencode(query_params)}")
 
     return self.get(url, headers=self.default_headers, params=query_params)
   
   def destroy(self, endpoint_id: int, response_header_name_id: int, query_params = {}) -> requests.Response:
     url = f"{self.service_url}/{self.ENDPOINTS_ENDPOINT}/{endpoint_id}/{self.RESPONSE_HEADER_NAME_ENDPOINT}/{response_header_name_id}"
 
-    Logger.instance().debug(f"{self.LOG_ID}.request_response:{url}?{urllib.parse.urlencode(query_params)}")
+    Logger.instance(LOG_ID).debug(f"{url}?{urllib.parse.urlencode(query_params)}")
 
     return self.delete(url, headers=self.default_headers, params=query_params)

stoobly_agent/lib/api/response_param_names_resource.py

@@ -7,6 +7,8 @@ from stoobly_agent.app.models.types import ParamNameCreateParams
 from ..logger import Logger
 from .endpoints_resource import EndpointsResource
 
+LOG_ID = 'ResponseParamNamesResource'
+
 class ResponseParamNamesResource(EndpointsResource):
   RESPONSE_PARAM_NAMES_ENDPOINT = 'response_param_names'
 
@@ -17,20 +19,20 @@ class ResponseParamNamesResource(EndpointsResource):
   def index(self, endpoint_id: int, query_params = {}) -> requests.Response:
     url = f"{self.service_url}/{self.ENDPOINTS_ENDPOINT}/{endpoint_id}/{self.RESPONSE_PARAM_NAMES_ENDPOINT}"
 
-    Logger.instance().debug(f"{self.LOG_ID}.request_response:{url}?{urllib.parse.urlencode(query_params)}")
+    Logger.instance(LOG_ID).debug(f"{url}?{urllib.parse.urlencode(query_params)}")
 
     return self.get(url, headers=self.default_headers, params=query_params)
 
   def show(self, endpoint_id: int, response_param_name_id: int, query_params = {}) -> requests.Response:
     url = f"{self.service_url}/{self.ENDPOINTS_ENDPOINT}/{endpoint_id}/{self.RESPONSE_PARAM_NAMES_ENDPOINT}/{response_param_name_id}"
 
-    Logger.instance().debug(f"{self.LOG_ID}.request_response:{url}?{urllib.parse.urlencode(query_params)}")
+    Logger.instance(LOG_ID).debug(f"{url}?{urllib.parse.urlencode(query_params)}")
 
     return self.get(url, headers=self.default_headers, params=query_params)
   
   def destroy(self, endpoint_id: int, response_param_name_id: int, query_params = {}) -> requests.Response:
     url = f"{self.service_url}/{self.ENDPOINTS_ENDPOINT}/{endpoint_id}/{self.RESPONSE_PARAM_NAMES_ENDPOINT}/{response_param_name_id}"
 
-    Logger.instance().debug(f"{self.LOG_ID}.request_response:{url}?{urllib.parse.urlencode(query_params)}")
+    Logger.instance(LOG_ID).debug(f"{url}?{urllib.parse.urlencode(query_params)}")
 
     return self.delete(url, headers=self.default_headers, params=query_params)

stoobly_agent/lib/api/scenarios_resource.py

@@ -7,6 +7,8 @@ from ..logger import Logger
 from .interfaces.pagination_query_params import PaginationQueryParams
 from .stoobly_api import StooblyApi
 
+LOG_ID = 'ScenariosResource'
+
 class ScenariosResource(StooblyApi):
   SCENARIOS_ENDPOINT = 'scenarios'
 
@@ -17,20 +19,20 @@ class ScenariosResource(StooblyApi):
   def index(self, **query_params: PaginationQueryParams) -> requests.Response:
     url = f"{self.service_url}/{self.SCENARIOS_ENDPOINT}"
 
-    Logger.instance().debug(f"{self.LOG_ID}.request_response:{url}?{urllib.parse.urlencode(query_params)}")
+    Logger.instance(LOG_ID).debug(f"{url}?{urllib.parse.urlencode(query_params)}")
 
     return self.get(url, headers=self.default_headers, params=query_params)
 
   def show(self, scenario_id: int, **query_params) -> requests.Response:
     url = f"{self.service_url}/{self.SCENARIOS_ENDPOINT}/{scenario_id}"
 
-    Logger.instance().debug(f"{self.LOG_ID}.request_response:{url}?{urllib.parse.urlencode(query_params)}")
+    Logger.instance(LOG_ID).debug(f"{url}?{urllib.parse.urlencode(query_params)}")
 
     return self.get(url, headers=self.default_headers, params=query_params)
 
   def update(self, scenario_id: int, **params):
     url = f"{self.service_url}/{self.SCENARIOS_ENDPOINT}/{scenario_id}"
 
-    Logger.instance().debug(f"{self.LOG_ID}.request_response:{url}")
+    Logger.instance(LOG_ID).debug(f"{url}")
 
     return self.put(url, headers=self.default_headers, json=params)

stoobly_agent/lib/api/stoobly_api.py

@@ -9,7 +9,6 @@ from stoobly_agent.lib.api.keys import InvalidReportKey, InvalidScenarioKey, Pro
 from .api import Api
 
 class StooblyApi(Api):
-    LOG_ID = 'lib.api.stoobly_api'
     REPORTS_ENDPOINT = '/reports'
     REQUESTS_ENDPOINT = '/requests'
     TESTS_ENDPOINT = '/tests'

stoobly_agent/lib/api/test_responses_resource.py

@@ -4,12 +4,14 @@ import urllib
 from ..logger import Logger
 from .tests_resource import TestsResource
 
+LOG_ID = 'TestResponsesResource'
+
 class TestResponsesResource(TestsResource):
   RESPONSES_ENDPOINT = 'responses'
 
   def mock(self, test_id: int, **query_params) -> requests.Response:
     url = f"{self.service_url}/{self.TESTS_ENDPOINT}/{test_id}/{self.RESPONSES_ENDPOINT}/mock"
 
-    Logger.instance().debug(f"{self.LOG_ID}.test_response_response:{url}?{urllib.parse.urlencode(query_params)}")
+    Logger.instance(LOG_ID).debug(f"{url}?{urllib.parse.urlencode(query_params)}")
 
     return self.get(url, headers=self.default_headers, params=query_params) 

stoobly_agent/lib/api/tests_resource.py

@@ -6,6 +6,8 @@ from stoobly_agent.lib.api.interfaces.tests import TestCreateParams
 from ..logger import Logger
 from .stoobly_api import StooblyApi
 
+LOG_ID = 'TestsResource'
+
 class TestsResource(StooblyApi):
   TESTS_ENDPOINT = 'tests'
 
@@ -22,6 +24,6 @@ class TestsResource(StooblyApi):
   def show(self, test_id: int, **query_params) -> requests.Response:
     url = f"{self.service_url}/{self.TESTS_ENDPOINT}/{test_id}"
 
-    Logger.instance().debug(f"{self.LOG_ID}.request_response:{url}?{urllib.parse.urlencode(query_params)}")
+    Logger.instance(LOG_ID).debug(f"{url}?{urllib.parse.urlencode(query_params)}")
 
     return self.get(url, headers=self.default_headers, params=query_params)

stoobly_agent/lib/api/users_resource.py

@@ -5,12 +5,14 @@ import pdb
 from ..logger import Logger
 from .stoobly_api import StooblyApi
 
+LOG_ID = 'UsersResource'
+
 class UsersResource(StooblyApi):
   USERS_ENDPOINT = 'users'
 
   def profile(self, query_params = {}) -> requests.Response:
     url = f"{self.service_url}/{self.USERS_ENDPOINT}/profile"
 
-    Logger.instance().debug(f"{self.LOG_ID}.request_response:{url}?{urllib.parse.urlencode(query_params)}")
+    Logger.instance(LOG_ID).debug(f"{url}?{urllib.parse.urlencode(query_params)}")
 
     return self.get(url, headers=self.default_headers, params=query_params)

stoobly_agent/lib/logger.py

@@ -31,13 +31,16 @@ class Logger:
         raise RuntimeError('Call instance() instead')
 
     @classmethod
-    def instance(cls):
+    def instance(cls, name = None):
         if cls._instance is None:
             cls._instance = cls.__new__(cls)
 
         cls._instance.load()
 
-        return logging
+        if not name:
+            return logging
+        else:
+            return logging.getLogger(name)
 
     @classmethod
     def reload(cls):

stoobly_agent/lib/utils/visitor.py

@@ -8,6 +8,7 @@ from jmespath.compat import string_type
 from numbers import Number
 from stoobly_agent.lib.logger import Logger
 
+LOG_ID = 'JmesPath'
 
 def _equals(x, y):
     if _is_special_integer_case(x, y):
@@ -108,7 +109,7 @@ class Visitor(object):
 
     def increment_visits(self, node):
         self.visited_nodes.append(node)
-        Logger.instance().debug(f"{len(self.visited_nodes)} {node}")
+        Logger.instance(LOG_ID).debug(f"{len(self.visited_nodes)} {node}")
 
     def build_traverse_path(self, node):
         if len(self.nodes) > 0:
@@ -118,9 +119,9 @@ class Visitor(object):
 
         self.build_traverse_path_traverse(node)
 
-        Logger.instance().debug('Traverse Path')
+        Logger.instance(LOG_ID).debug('Traverse Path')
         for i, node in enumerate(self.nodes):
-            Logger.instance().debug(f"{i + 1} {node}")
+            Logger.instance(LOG_ID).debug(f"{i + 1} {node}")
 
     def build_traverse_path_traverse(self, node):
         if node['type'] == 'projection':

stoobly_agent/test/app/cli/snapshot/snapshot_copy_test.py

@@ -0,0 +1,56 @@
+import importlib
+import os
+import pdb
+import pytest
+import tempfile
+
+from click.testing import CliRunner
+
+from stoobly_agent.app.models.factories.resource.local_db.helpers.log import Log
+from stoobly_agent.cli import record, request, snapshot
+from stoobly_agent.config.data_dir import DataDir
+from stoobly_agent.lib.api.keys import RequestKey
+from stoobly_agent.lib.orm.request import Request
+from stoobly_agent.test.test_helper import DETERMINISTIC_GET_REQUEST_URL, reset
+
+@pytest.fixture(scope='module')
+def runner():
+    return CliRunner()
+
+class TestCopy():
+    @pytest.fixture(scope='class', autouse=True)
+    def settings(self):
+      return reset()
+
+    class TestWhenRequest():
+      @pytest.fixture(scope='class')
+      def recorded_request(self, runner: CliRunner):
+        record_result = runner.invoke(record, [DETERMINISTIC_GET_REQUEST_URL])
+        assert record_result.exit_code == 0
+        return Request.last()
+
+      @pytest.fixture(autouse=True, scope='class')
+      def snapshot_result(self, runner: CliRunner, recorded_request: Request):
+        snapshot_result = runner.invoke(request, ['snapshot', recorded_request.key()])
+        assert snapshot_result.exit_code == 0
+        return snapshot_result
+
+      def test_it_copies(self, runner: CliRunner, recorded_request: Request):
+        with tempfile.TemporaryDirectory() as dirpath:
+          data_dir = DataDir(dirpath)
+          log = Log(data_dir)
+
+          # Check that no events have been copied
+          assert len(log.events) == 0
+
+          apply_result = runner.invoke(snapshot, ['copy', dirpath, '--request-key', recorded_request.key()])
+          assert apply_result.exit_code == 0
+
+          # Check that one event has been copied
+          assert len(log.events) == 1
+
+          event = log.events[0]
+          request_key = RequestKey(recorded_request.key())
+
+          # Check that the event is the request
+          assert request_key.id == event.resource_uuid

stoobly_agent/test/app/cli/snapshot/snapshot_prune_test.py

@@ -3,15 +3,12 @@ import pytest
 import time
 
 from click.testing import CliRunner
-from typing import List
 
 from stoobly_agent.app.models.factories.resource.local_db.helpers.log import Log
 from stoobly_agent.app.models.factories.resource.local_db.helpers.log_event import DELETE_ACTION, LogEvent
-from stoobly_agent.app.models.factories.resource.local_db.helpers.scenario_snapshot import ScenarioSnapshot
-from stoobly_agent.cli import record, request, scenario, snapshot
+from stoobly_agent.cli import record, request, snapshot
 from stoobly_agent.lib.orm.request import Request
-from stoobly_agent.lib.orm.scenario import Scenario
-from stoobly_agent.test.test_helper import assert_orm_request_equivalent, DETERMINISTIC_GET_REQUEST_URL, NON_DETERMINISTIC_GET_REQUEST_URL, reset
+from stoobly_agent.test.test_helper import DETERMINISTIC_GET_REQUEST_URL, reset
 
 @pytest.fixture(scope='module')
 def runner():

stoobly_agent/test/app/cli/snapshot/snapshot_update_test.py

@@ -3,7 +3,6 @@ import pytest
 import time
 
 from click.testing import CliRunner
-from typing import List
 
 from stoobly_agent.app.models.adapters.joined_request_adapter import JoinedRequestAdapter
 from stoobly_agent.app.models.adapters.raw_http_response_adapter import RawHttpResponseAdapter

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

@@ -1 +1 @@
-0.34.8
+0.34.11

stoobly_agent/test/app/proxy/replay/body_parser_service_test.py

@@ -16,11 +16,11 @@ class TestMultipart():
   def test_decodes_response(self, multipart_string: bytes, content_type: str):
     multidict = decode_response(multipart_string, content_type)
 
-    assert multidict.get('author') == b'John Smith'
-    assert multidict.get('file') == b'Hello World'
+    assert multidict.get('author') == 'John Smith'
+    assert multidict.get('file') == 'Hello World'
 
   def test_encodes_response(self, content_type: str):
-    expected_params = { 'author': b'John Smith', 'file': b'Hello World'}
+    expected_params = { 'author': 'John Smith', 'file': 'Hello World'}
     multipart_string = encode_response(expected_params, content_type)
 
     multidict = decode_response(multipart_string, content_type)

stoobly_agent/test/config/data_dir_test.py

@@ -34,7 +34,8 @@ class TestDataDir():
 
   def test_in_cwd(self, original_cwd: str):
     os.environ[ENV] = NONE
-    DataDir._instance = None
+    DataDir._instances = None
+
     temp_dir = os.path.join(original_cwd, 'tmp')
     nested_temp_dir = os.path.join(temp_dir, 'tmp-nested')
     data_dir_path = os.path.join(nested_temp_dir, DataDir.DATA_DIR_NAME)
@@ -55,7 +56,8 @@ class TestDataDir():
 
   def test_in_parent_nested(self, original_cwd: str):
     os.environ[ENV] = NONE
-    DataDir._instance = None
+    DataDir._instances = None
+
     # Create a temporary directory structure for testing
     temp_dir = os.path.join(original_cwd, 'tmp')
 

{stoobly_agent-0.34.10.dist-info → stoobly_agent-0.34.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: stoobly-agent
-Version: 0.34.10
+Version: 0.34.12
 Summary: Record, mock, and test HTTP(s) requests. CLI agent for Stoobly
 License: Apache-2.0
 Author: Matt Le
@@ -20,6 +20,7 @@ Requires-Dist: httptools (>=0.4.0)
 Requires-Dist: jmespath (>=1.0.0)
 Requires-Dist: mergedeep (>=1.3.0,<1.3.4)
 Requires-Dist: mitmproxy (>=8.0.0,<=8.1.0)
+Requires-Dist: multipart (>=0.2.5,<0.3.0)
 Requires-Dist: openapi-core (>=0.17.0,<0.18.0)
 Requires-Dist: pyyaml (>=6.0.1)
 Requires-Dist: requests (>=2.31.0)