appmap 2.0.9__tar.gz → 2.1.0__tar.gz

{appmap-2.0.9 → appmap-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: appmap
-Version: 2.0.9
+Version: 2.1.0
 Summary: Create AppMap files by recording a Python application.
 Home-page: https://github.com/applandinc/appmap-python
 License: MIT

{appmap-2.0.9 → appmap-2.1.0}/_appmap/event.py

@@ -176,7 +176,7 @@ class Param:
 
 class CallEvent(Event):
     # pylint: disable=method-cache-max-size-none
-    __slots__ = ["_fn", "_fqfn", "static", "receiver", "parameters", "labels"]
+    __slots__ = ["_fn", "_fqfn", "static", "receiver", "parameters", "labels", "auxtype"]
 
     @staticmethod
     def make(fn, fntype):
@@ -283,7 +283,10 @@ class CallEvent(Event):
     @property
     @lru_cache(maxsize=None)
     def method_id(self):
-        return self._fqfn.fqfn[1]
+        ret = self._fqfn.fqfn[1]
+        if self.auxtype is not None:
+            ret = f"{ret} ({self.auxtype})"
+        return ret
 
     @property
     @lru_cache(maxsize=None)
@@ -319,6 +322,13 @@ class CallEvent(Event):
             parameters = parameters[1:]
         self.parameters = parameters
         self.labels = labels
+        self.auxtype = None
+        if fntype & FnType.GET:
+            self.auxtype = "get"
+        elif fntype & FnType.SET:
+            self.auxtype = "set"
+        elif fntype & FnType.DEL:
+            self.auxtype = "del"
 
     def to_dict(self, attrs=None):
         ret = super().to_dict()  # get the attrs defined in __slots__

{appmap-2.0.9 → appmap-2.1.0}/_appmap/importer.py

@@ -37,14 +37,14 @@ class FilterableCls(Filterable):
 class FilterableFn(
     namedtuple(
         "FilterableFn",
-        Filterable._fields + ("static_fn",),
+        Filterable._fields + ("static_fn", "auxtype"),
     )
 ):
     __slots__ = ()
 
-    def __new__(cls, scope, fn, static_fn):
+    def __new__(cls, scope, fn, static_fn, auxtype=None):
         fqname = "%s.%s" % (scope.fqname, fn.__name__)
-        self = super(FilterableFn, cls).__new__(cls, scope.scope, fqname, fn, static_fn)
+        self = super(FilterableFn, cls).__new__(cls, scope.scope, fqname, fn, static_fn, auxtype)
         return self
 
     @property
@@ -52,7 +52,10 @@ class FilterableFn(
         if self.scope == Scope.MODULE:
             return FnType.MODULE
 
-        return FnType.classify(self.static_fn)
+        ret = FnType.classify(self.static_fn)
+        if self.auxtype is not None:
+            ret |= self.auxtype
+        return ret
 
 
 class Filter(ABC):  # pylint: disable=too-few-public-methods
@@ -122,19 +125,31 @@ def get_members(cls):
     # instead iterate over dir(cls), we would see functions from
     # superclasses, too. Those don't need to be instrumented here,
     # they'll get taken care of when the superclass is imported.
-    ret = []
+    functions = []
+    properties = {}
     modname = cls.__module__ if hasattr(cls, "__module__") else cls.__name__
     for key in cls.__dict__:
         if key.startswith("__"):
             continue
         static_value = inspect.getattr_static(cls, key)
-        if not is_member_func(static_value):
-            continue
-        value = getattr(cls, key)
-        if value.__module__ != modname:
-            continue
-        ret.append((key, static_value, value))
-    return ret
+        if isinstance(static_value, property):
+            properties[key] = (
+                static_value,
+                {
+                    "fget": (static_value.fget, FnType.GET),
+                    "fset": (static_value.fset, FnType.SET),
+                    "fdel": (static_value.fdel, FnType.DEL),
+                },
+            )
+        else:
+            if not is_member_func(static_value):
+                continue
+            value = getattr(cls, key)
+            if value.__module__ != modname:
+                continue
+            functions.append((key, static_value, value))
+
+    return (functions, properties)
 
 
 class Importer:
@@ -177,7 +192,7 @@ class Importer:
 
         def instrument_functions(filterable, selected_functions=None):
             logger.trace("  looking for members of %s", filterable.obj)
-            functions = get_members(filterable.obj)
+            functions, properties = get_members(filterable.obj)
             logger.trace("  functions %s", functions)
 
             for fn_name, static_fn, fn in functions:
@@ -185,6 +200,20 @@ class Importer:
                 new_fn = cls.instrument_function(fn_name, filterableFn, selected_functions)
                 if new_fn != fn:
                     wrapt.wrap_function_wrapper(filterable.obj, fn_name, new_fn)
+            # Now that we've instrumented all the functions, go through the properties and update
+            # them
+            for prop_name, (prop, prop_fns) in properties.items():
+                instrumented_fns = {}
+                for k, (fn, auxtype) in prop_fns.items():
+                    if fn is None:
+                        continue
+                    filterableFn = FilterableFn(filterable, fn, fn, auxtype)
+                    new_fn = cls.instrument_function(fn.__name__, filterableFn, selected_functions)
+                    if new_fn != fn:
+                        new_fn = wrapt.FunctionWrapper(fn, new_fn)
+                    instrumented_fns[k] = new_fn
+                instrumented_fns["doc"] = prop.__doc__
+                setattr(filterable.obj, prop_name, property(**instrumented_fns))
 
         # Import Config here, to avoid circular top-level imports.
         from .configuration import Config  # pylint: disable=import-outside-toplevel

appmap-2.1.0/_appmap/test/data/django/test/test_unittest_setup.py

@@ -0,0 +1,11 @@
+
+from unittest import TestCase
+
+from django.test import Client
+
+class DisabledRequestsRecordingTest(TestCase):
+    def setUp(self) -> None:
+        Client().get("/")
+
+    def test_request_in_setup(self):
+        pass

{appmap-2.0.9 → appmap-2.1.0}/_appmap/test/data/example_class.py

@@ -113,6 +113,53 @@ class ExampleClass(Super, ClassMethodMixin):
     def return_self(self):
         return self
 
+    def __init__(self):
+        self._read_only = "read only"
+        self._fully_accessible = "fully accessible"
+        self._undecorated = "undecorated"
+
+    @property
+    def read_only(self):
+        """Read-only"""
+        return self._read_only
+
+    @property
+    def fully_accessible(self):
+        """Fully-accessible"""
+        return self._fully_accessible
+
+    @fully_accessible.setter
+    def fully_accessible(self, v):
+        self._fully_accessible = v
+
+    @fully_accessible.deleter
+    def fully_accessible(self):
+        del self._fully_accessible
+
+    def get_undecorated(self):
+        return self._undecorated
+
+    def set_undecorated(self, value):
+        self._undecorated = value
+
+    def delete_undecorated(self):
+        del self._undecorated
+
+    undecorated_property = property(get_undecorated, set_undecorated, delete_undecorated)
+
+    def set_write_only(self, v):
+        self._write_only = v
+
+    def del_write_only(self):
+        del self._write_only
+
+    write_only = property(None, set_write_only, del_write_only, "Write-only")
+
 
 def modfunc():
     return "Hello world!"
+
+if __name__ == "__main__":
+    ec = ExampleClass()
+    ec.fully_accessible = "updated"
+    print(ec.fully_accessible)

appmap-2.0.9/_appmap/test/data/pytest/expected/pytest.appmap.json → appmap-2.1.0/_appmap/test/data/pytest/expected/pytest-numpy1.appmap.json

@@ -8,75 +8,95 @@
       "name": "appmap",
       "url": "https://github.com/applandinc/appmap-python"
     },
-    "source_location": "test_simple.py:5",
-    "name": "hello world",
-    "feature": "Hello world",
     "app": "Simple",
     "recorder": {
       "name": "pytest",
       "type": "tests"
     },
+    "source_location": "test_simple.py:5",
+    "name": "hello world",
+    "feature": "Hello world",
     "test_status": "succeeded"
   },
   "events": [
     {
+      "defined_class": "simple.Simple",
+      "method_id": "hello_world",
+      "path": "simple.py",
+      "lineno": 8,
       "static": false,
       "receiver": {
+        "class": "simple.Simple",
         "kind": "req",
-        "value": "<simple.Simple object at 0xabcdef>",
         "name": "self",
-        "class": "simple.Simple"
+        "value": "<simple.Simple object at 0xabcdef>"
       },
       "parameters": [],
       "id": 1,
       "event": "call",
-      "thread_id": 1,
-      "defined_class": "simple.Simple",
-      "method_id": "hello_world",
-      "path": "simple.py",
-      "lineno": 16
+      "thread_id": 1
     },
     {
+      "defined_class": "simple.Simple",
+      "method_id": "hello",
+      "path": "simple.py",
+      "lineno": 2,
       "static": false,
       "receiver": {
+        "class": "simple.Simple",
         "kind": "req",
-        "value": "<simple.Simple object at 0xabcdef>",
         "name": "self",
-        "class": "simple.Simple"
+        "value": "<simple.Simple object at 0xabcdef>"
       },
       "parameters": [],
       "id": 2,
       "event": "call",
-      "thread_id": 1,
-      "defined_class": "simple.Simple",
-      "method_id": "get_non_json_serializable",
-      "path": "simple.py",
-      "lineno": 13
+      "thread_id": 1
     },
     {
+      "return_value": {
+        "class": "builtins.str",
+        "value": "'Hello'"
+      },
+      "parent_id": 2,
+      "id": 3,
+      "event": "return",
+      "thread_id": 1
+    },
+    {
+      "defined_class": "simple.Simple",
+      "method_id": "world",
+      "path": "simple.py",
+      "lineno": 5,
       "static": false,
       "receiver": {
+        "class": "simple.Simple",
         "kind": "req",
-        "value": "<simple.Simple object at 0xabcdef>",
         "name": "self",
-        "class": "simple.Simple"
+        "value": "<simple.Simple object at 0xabcdef>"
       },
       "parameters": [],
-      "id": 3,
+      "id": 4,
       "event": "call",
-      "thread_id": 1,
-      "defined_class": "simple.Simple",
-      "method_id": "hello",
-      "path": "simple.py",
-      "lineno": 7
+      "thread_id": 1
     },
     {
       "return_value": {
-        "value": "'Hello'",
-        "class": "builtins.str"
+        "class": "builtins.str",
+        "value": "'world!'"
       },
-      "parent_id": 3,
-      "id": 4,
+      "parent_id": 4,
+      "id": 5,
+      "event": "return",
+      "thread_id": 1
+    },
+    {
+      "return_value": {
+        "class": "builtins.str",
+        "value": "'Hello world!'"
+      },
+      "parent_id": 1,
+      "id": 6,
       "event": "return",
       "thread_id": 1
     },
@@ -89,27 +109,52 @@
         "class": "simple.Simple"
       },
       "parameters": [],
-      "id": 5,
+      "id": 7,
       "event": "call",
       "thread_id": 1,
       "defined_class": "simple.Simple",
-      "method_id": "world",
+      "method_id": "show_numpy_dict",
       "path": "simple.py",
-      "lineno": 10
+      "lineno": 11
     },
     {
-      "return_value": {
-        "value": "'world!'",
-        "class": "builtins.str"
+      "static": false,
+      "receiver": {
+        "kind": "req",
+        "value": "<simple.Simple object at 0xabcdef>",
+        "name": "self",
+        "class": "simple.Simple"
       },
-      "parent_id": 5,
-      "id": 6,
-      "event": "return",
-      "thread_id": 1
+      "parameters": [
+        {
+          "kind": "req",
+          "value": "{0: 'zero', 1: 'one'}",
+          "name": "d",
+          "class": "builtins.dict",
+          "properties": [
+            {
+              "name": "0",
+              "class": "builtins.str"
+            },
+            {
+              "name": "1",
+              "class": "builtins.str"
+            }
+          ],
+          "size": 2
+        }
+      ],
+      "id": 8,
+      "event": "call",
+      "thread_id": 1,
+      "defined_class": "simple.Simple",
+      "method_id": "get_numpy_dict",
+      "path": "simple.py",
+      "lineno": 18
     },
     {
       "return_value": {
-        "value": "{0: 'Hello', 1: 'world!'}",
+        "value": "{0: 'zero', 1: 'one'}",
         "class": "builtins.dict",
         "properties": [
           {
@@ -123,18 +168,29 @@
         ],
         "size": 2
       },
-      "parent_id": 2,
-      "id": 7,
+      "parent_id": 8,
+      "id": 9,
       "event": "return",
       "thread_id": 1
     },
     {
       "return_value": {
-        "value": "'Hello world!'",
-        "class": "builtins.str"
+        "value": "{0: 'zero', 1: 'one'}",
+        "class": "builtins.dict",
+        "properties": [
+          {
+            "name": "0",
+            "class": "builtins.str"
+          },
+          {
+            "name": "1",
+            "class": "builtins.str"
+          }
+        ],
+        "size": 2
       },
-      "parent_id": 1,
-      "id": 8,
+      "parent_id": 7,
+      "id": 10,
       "event": "return",
       "thread_id": 1
     }
@@ -149,27 +205,33 @@
           "type": "class",
           "children": [
             {
-              "name": "get_non_json_serializable",
+              "name": "get_numpy_dict",
               "type": "function",
-              "location": "simple.py:13",
+              "location": "simple.py:18",
               "static": false
             },
             {
               "name": "hello",
               "type": "function",
-              "location": "simple.py:7",
+              "location": "simple.py:2",
               "static": false
             },
             {
               "name": "hello_world",
               "type": "function",
-              "location": "simple.py:16",
+              "location": "simple.py:8",
+              "static": false
+            },
+            {
+              "name": "show_numpy_dict",
+              "type": "function",
+              "location": "simple.py:11",
               "static": false
             },
             {
               "name": "world",
               "type": "function",
-              "location": "simple.py:10",
+              "location": "simple.py:5",
               "static": false
             }
           ]