stoobly-agent 0.34.9__py3-none-any.whl → 0.34.11__py3-none-any.whl

stoobly_agent/lib/api/projects_resource.py

@@ -7,26 +7,28 @@ from ..logger import Logger
 from .interfaces import ProjectCreateParams, ProjectsIndexQueryParams
 from .stoobly_api import StooblyApi
 
+LOG_ID = 'ProjectsResource'
+
 class ProjectsResource(StooblyApi):
   PROJECTS_ENDPOINT = 'projects'
 
   def create(self, **params: ProjectCreateParams):
     url = f"{self.service_url}/{self.PROJECTS_ENDPOINT}"
 
-    Logger.instance().debug(f"{self.LOG_ID}.request_response:{url}?{urllib.parse.urlencode(params)}")
+    Logger.instance(LOG_ID).debug(f"{url}?{urllib.parse.urlencode(params)}")
 
     return self.post(url, headers=self.default_headers, json=params)
 
   def index(self, **query_params: ProjectsIndexQueryParams) -> requests.Response:
     url = f"{self.service_url}/{self.PROJECTS_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, project_id: int, **query_params) -> requests.Response:
     url = f"{self.service_url}/{self.PROJECTS_ENDPOINT}/{project_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/query_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 = 'QueryParamNamesResource'
+
 class QueryParamNamesResource(EndpointsResource):
   QUERY_PARAM_NAMES_ENDPOINT = 'query_param_names'
 
@@ -17,20 +19,20 @@ class QueryParamNamesResource(EndpointsResource):
   def index(self, endpoint_id: int, query_params = {}) -> requests.Response:
     url = f"{self.service_url}/{self.ENDPOINTS_ENDPOINT}/{endpoint_id}/{self.QUERY_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, query_param_name_id: int, query_params = {}) -> requests.Response:
     url = f"{self.service_url}/{self.ENDPOINTS_ENDPOINT}/{endpoint_id}/{self.QUERY_PARAM_NAMES_ENDPOINT}/{query_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, query_param_name_id: int, query_params = {}) -> requests.Response:
     url = f"{self.service_url}/{self.ENDPOINTS_ENDPOINT}/{endpoint_id}/{self.QUERY_PARAM_NAMES_ENDPOINT}/{query_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/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/cache.py

@@ -1,5 +1,6 @@
 import pdb
 import random
+import re
 
 from time import time
 
@@ -23,10 +24,19 @@ class Cache:
 
         return cls._instance
 
-    def clear(self):
-        self.data = {}
-        self.dataVersions = {}
-        self.version += 1
+    def clear(self, pattern: str = None):
+        if not pattern:
+            self.data = {}
+            self.dataVersions = {}
+            self.version += 1
+        else:
+            delete_list = []
+            for key in self.data.keys():
+                if re.match(pattern, key):
+                    delete_list.append(key)
+            
+            for key in delete_list:
+                self.delete(key)
 
     def read(self, key):
         if key in self.timeouts:
@@ -48,9 +58,10 @@ class Cache:
 
     def read_all(self):
         data = []
-
-        for key in self.data.keys():
+        
+        for key in list(self.data.keys()):
             datum = self.read(key)
+
             if datum:
                 data.append(datum)
 
@@ -73,7 +84,13 @@ class Cache:
         self.version += 1
 
     def delete(self, key):
-        del self.data[key]
-        del self.dataVersions[key]
-        del self.timeouts[key]
+        if key in self.data:
+            del self.data[key]
+
+        if key in self.dataVersions:
+            del self.dataVersions[key]
+
+        if key in self.timeouts:
+            del self.timeouts[key]
+
         self.version += 1

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':