retracesoftware-proxy 0.1.6__py3-none-any.whl → 0.1.8__py3-none-any.whl

retracesoftware/config.json

@@ -160,12 +160,24 @@
     "_imp": {
       "patch_extension_exec": ["exec_dynamic", "exec_builtin"]
     },
+    "bdb": {
+      "methods_with_state": {
+        "disabled": {
+          "Bdb": ["trace_dispatch"]
+        }
+      },
+      "with_state": {
+        "disabled": ["Bdb.trace_dispatch"]
+      }
+    },
     "sys": {
       "with_state": {
         "disabled": ["excepthook"]
       },
-      "with_state_recursive0": {
-        "disabled": ["settrace", "setprofile"]
+      "comment": {
+        "with_state_recursive": {
+          "disabled": ["settrace", "setprofile"]
+        }
       }
     },
     
@@ -264,10 +276,16 @@
         "open_code": "path",
         "open": "file"
       },
-      "wrap": {
-        "FileIO.readinfo": "retracesoftware.install.edgecases.readinto",
-        "BufferedReader.readinfo": "retracesoftware.install.edgecases.readinto",
-        "BufferedRandom.readinfo": "retracesoftware.install.edgecases.readinto"
+      "patchtype": {
+        "FileIO": {
+          "readinfo": "retracesoftware.install.edgecases.readinto"
+        },
+        "BufferedReader": {
+          "readinfo": "retracesoftware.install.edgecases.readinto"
+        },
+        "BufferedRandom": {
+          "readinfo": "retracesoftware.install.edgecases.readinto"
+        }
       }
     },
     "pathlib": {
@@ -323,10 +341,12 @@
         "gaierror",
         "timeout"
       ],
-      "wrap": {
-        "socket.recvfrom_into": "retracesoftware.install.edgecases.recvfrom_into",
-        "socket.recv_into": "retracesoftware.install.edgecases.recv_into",
-        "socket.recvmsg_into": "retracesoftware.install.edgecases.recvmsg_into"
+      "patchtype": {
+        "socket": {
+          "recvfrom_into": "retracesoftware.install.edgecases.recvfrom_into",
+          "recv_into": "retracesoftware.install.edgecases.recv_into",
+          "recvmsg_into": "retracesoftware.install.edgecases.recvmsg_into"
+        }
       }
     },
     "select": {
@@ -349,8 +369,10 @@
             "_SSLSocket.write": "write"
           }
         },
-      "wrap": {
-        "_SSLSocket.read": "retracesoftware.install.edgecases.read"
+      "patchtype": {
+        "_SSLSocket": {
+          "read": "retracesoftware.install.edgecases.read"
+        }
       }
     },
     "_random": {

retracesoftware/install/patcher.py

@@ -25,7 +25,7 @@ from retracesoftware.install.config import load_config
 from functools import wraps
 
 import retracesoftware.functional as functional
-import retracesoftware_utils as utils
+import retracesoftware.utils as utils
 
 from retracesoftware.install import edgecases
 from functools import partial
@@ -137,9 +137,9 @@ def superdict(cls):
     
     return result
 
-def is_method_descriptor(obj):
-    return isinstance(obj, types.FunctionType) or \
-           (isinstance(obj, (types.WrapperDescriptorType, types.MethodDescriptorType)) and obj.__objclass__ != object)
+# def is_method_descriptor(obj):
+#     return isinstance(obj, types.FunctionType) or \
+#            (isinstance(obj, (types.WrapperDescriptorType, types.MethodDescriptorType)) and obj.__objclass__ != object)
 
 def wrap_method_descriptors(wrapper, prefix, base):
     slots = {"__slots__": () }
@@ -150,7 +150,7 @@ def wrap_method_descriptors(wrapper, prefix, base):
 
     for name,value in superdict(base).items():
         if name not in blacklist:
-            if is_method_descriptor(value):
+            if utils.is_method_descriptor(value):
                 setattr(extended, name, wrapper(value))
 
     return extended
@@ -179,6 +179,7 @@ class Patcher:
         self.type_attribute_filter = self.predicate(config['type_attribute_filter'])
         self.post_commit = post_commit
         self.exclude_paths = [re.compile(s) for s in config.get('exclude_paths', [])]
+        self.typepatcher = {}
 
         def is_phase(name): return getattr(getattr(self, name, None), "is_phase", False)
         
@@ -193,7 +194,21 @@ class Patcher:
                 # print(f'in path_predicate, excluding {path}')
                 return False
         return True
-                        
+
+    def on_proxytype(self, cls):
+
+        def patch(spec):
+            for method, transform in spec.items():                
+                setattr(cls, method, resolve(transform)(getattr(cls, method)))
+
+        if cls.__module__ in self.modules:
+            spec = self.modules[cls.__module__]
+
+            if 'patchtype' in spec:
+                patchtype = spec['patchtype']
+                if cls.__name__ in patchtype:
+                    patch(patchtype[cls.__name__])
+
     @property
     def disable(self):
         return self.thread_state.select('disabled')
@@ -314,15 +329,35 @@ class Patcher:
         for state,elems in spec.items():
 
             def wrap(obj): 
-                return functional.recursive_wrap(
-                    callable, 
-                    lambda f: self.thread_state.wrap(state, f),
+                return functional.recurive_wrap_function(
+                    functional.partial(self.thread_state.wrap, state),
                     obj)
             
             updates.update(map_values(wrap, select_keys(elems, mod_dict)))
         
         return updates
 
+    @phase
+    def methods_with_state(self, spec, mod_dict):
+
+        # updates = {}
+
+        def update(cls, name, f):
+            setattr(cls, name, f(getattr(cls, name)))
+
+        for state,cls_methods in spec.items():
+            def wrap(obj): 
+                assert callable(obj)
+                return self.thread_state.wrap(desired_state = state, function = obj)
+
+            for typename,methodnames in cls_methods.items():
+                cls = mod_dict[typename]
+
+                for methodname in methodnames:
+                    update(cls, methodname, wrap)
+        
+        return {}
+
     @phase
     def with_state(self, spec, mod_dict):
 
@@ -330,7 +365,8 @@ class Patcher:
 
         for state,elems in spec.items():
 
-            def wrap(obj): return self.thread_state.wrap(desired_state = state, function = obj)
+            def wrap(obj): 
+                return self.thread_state.wrap(desired_state = state, function = obj)
 
             updates.update(map_values(wrap, select_keys(elems, mod_dict)))
         
@@ -377,7 +413,9 @@ class Patcher:
             name = parts[0]
             if name in mod_dict:
                 value = mod_dict[name]
-                assert not isinstance(value, utils.wrapped_function), f"value for key: {name} is already wrapped"
+                assert not isinstance(value, utils.wrapped_function), \
+                    f"value for key: {name} is already wrapped"
+                
                 if len(parts) == 1:
                     updates[name] = resolve(wrapper_name)(value)
                 elif len(parts) == 2:
@@ -436,9 +474,6 @@ class Patcher:
 
     def __call__(self, module):
 
-        # if module.__name__ == 'locale':
-        #     utils.sigtrap(None)
-
         if not hasattr(module, '__retrace__'):
             configs = list(self.configs(module))
 
@@ -446,6 +481,7 @@ class Patcher:
                 if len(configs) > 1:
                     raise Exception(f'TODO')
                 else:
+                    module.__retrace__ = None
                     try:
                         self.patch_module_with_name(configs[0], module)
                     except Exception as error:
@@ -518,6 +554,8 @@ def install(mode):
                       system = system,
                       post_commit = getattr(system, 'on_patched', None),
                       immutable_types = immutable_types)
+    
+    system.on_proxytype = patcher.on_proxytype
 
     def at_exit(): thread_state.value = 'disabled'
 

retracesoftware/proxy/proxysystem.py

@@ -54,7 +54,7 @@ class ProxySystem:
 
     def on_ext_error(self, err_type, err_value, err_traceback):
         pass
-
+        
     # def stacktrace(self):
     #     self.tracer.stacktrace()
 
@@ -120,18 +120,20 @@ class ProxySystem:
     def create_stub(self): return False
         
     def int_proxytype(self, cls):
-        return dynamic_int_proxytype(
+        proxytype = dynamic_int_proxytype(
                 handler = self.int_dispatch,
                 cls = cls,
                 bind = self.bind)
+        
+        if self.on_proxytype: self.on_proxytype(proxytype)
+        return proxytype
+
 
     def dynamic_ext_proxytype(self, cls):
 
-        proxytype = dynamic_proxytype(
-            handler = self.ext_dispatch,
-            cls = cls)
-        if self.on_proxytype:
-            self.on_proxytype(proxytype)
+        proxytype = dynamic_proxytype(handler = self.ext_dispatch, cls = cls)
+        
+        if self.on_proxytype: self.on_proxytype(proxytype)
         
         return proxytype
         
@@ -146,15 +148,12 @@ class ProxySystem:
     def ext_proxytype(self, cls):
         assert isinstance(cls, type)
         if utils.is_extendable(cls):
-            return self.extend_type(cls)
-        else:    
-            return self.proxy_function(cls)
-        
-            # return instantiable_dynamic_proxytype(
-            #         handler = self.ext_dispatch, 
-            #         cls = cls,
-            #         thread_state = self.thread_state,
-            #         create_stub = self.create_stub())
+            proxytype = self.extend_type(cls)
+            if self.on_proxytype: self.on_proxytype(proxytype)
+            return proxytype
+        else:
+            new = functional.droparg(self.proxy_function(cls))
+            return type(cls.__name__, (object,), {'__module__': cls.__module__, '__new__': new})
 
     def basetype(self, cls):
         return cls
@@ -199,6 +198,7 @@ class ProxySystem:
         
         else:
             proxytype = dynamic_proxytype(handler = self.ext_dispatch, cls = type(obj))
+            if self.on_proxytype: self.on_proxytype(proxytype)
 
             return utils.create_wrapped(proxytype, obj)
             # raise Exception(f'object {obj} was not proxied as its not a extensible type and is not callable')

retracesoftware/proxy/proxytype.py

@@ -186,6 +186,7 @@ class ExtendingDescriptorProxy:
         return self.handler(getter, self.name)
 
     def __set__(self, instance, value):
+        breakpoint()
         setter = functional.partial(setattr, super(self.proxytype, instance))
         return self.handler(setter, self.name, value)
 
@@ -314,6 +315,11 @@ def create_unproxied_type(cls):
 
     bases = tuple(map(unproxy_type, cls.__bases__))
     slots = dict(cls.__dict__)
+
+    if '__slots__' in slots:
+        for slot in slots['__slots__']:
+            slots.pop(slot)
+
     # del slots['__init_subclass__']
     return type(cls.__name__, tuple(bases), slots)
 
@@ -357,7 +363,8 @@ def extending_proxytype(cls, base, thread_state, ext_handler, int_handler, on_su
     extended = type(cls.__name__, (base, ExtendingProxy), slots)
 
     for name in descriptors:
-        proxy = ExtendingDescriptorProxy(handler = ext_handler, name = name, proxytype = extended)
+        # proxy = ExtendingDescriptorProxy(handler = ext_handler, name = name, proxytype = extended)
+        proxy = DescriptorProxy(handler = ext_handler, target = getattr(cls, name))
         setattr(extended, name, proxy)
                     
     def unproxied__new__(subclass, *args, **kwargs):

retracesoftware/proxy/record.py

@@ -70,6 +70,13 @@ class RecordProxySystem(ProxySystem):
         self.thread_state.value = self.saved_thread_state
         self.writer.reopen()
 
+    def sync(self, function):
+        write_sync = functional.always(self.writer.handle('SYNC'))
+
+        return utils.observer(
+            on_call = functional.firstof(self.thread_switch_monitor, write_sync),
+            function = function)
+    
     def __init__(self, thread_state, 
                  immutable_types, 
                  tracing_config,
@@ -95,11 +102,11 @@ class RecordProxySystem(ProxySystem):
 
         serialize = functional.walker(self.bindings.get_else_key)
         
-        thread_switch_monitor = \
+        self.thread_switch_monitor = \
             utils.thread_switch_monitor(
                 functional.repeatedly(functional.sequence(utils.thread_id, self.writer)))
 
-        self.sync = lambda function: functional.firstof(thread_switch_monitor, functional.always(self.writer.handle('SYNC')), function)
+        # self.sync = lambda function: functional.firstof(self.thread_switch_monitor, functional.always(self.writer.handle('SYNC')), function)
             
         error = self.writer.handle('ERROR')
 
@@ -108,7 +115,7 @@ class RecordProxySystem(ProxySystem):
         
         self.set_thread_id = functional.partial(utils.set_thread_id, self.writer)
 
-        def watch(f): return functional.either(thread_switch_monitor, f)
+        def watch(f): return functional.either(self.thread_switch_monitor, f)
 
         tracer = Tracer(tracing_config, writer = self.writer.handle('TRACE'))
 

{retracesoftware_proxy-0.1.6.dist-info → retracesoftware_proxy-0.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: retracesoftware_proxy
-Version: 0.1.6
+Version: 0.1.8
 License: Apache-2.0
 Requires-Dist: retracesoftware_utils
 Requires-Dist: retracesoftware_functional

{retracesoftware_proxy-0.1.6.dist-info → retracesoftware_proxy-0.1.8.dist-info}/RECORD

@@ -1,11 +1,11 @@
 retracesoftware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-retracesoftware/config.json,sha256=fzfxZF6ES2NuPO9u9fNX8xMZ5rKZStxAHovsVTSJYzs,8276
+retracesoftware/config.json,sha256=_GTEhl9ba5ed9io_sWAR3nO30T-w66qU6Q-fHKguEHg,8638
 retracesoftware/install/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 retracesoftware/install/config.py,sha256=EzE5ifQF2lo--hu2njI4T0FJ-zlnWDJV6i7x0DMkVTw,1364
 retracesoftware/install/edgecases.py,sha256=NR3lyvad9sRsyeDv_Ya8V4xMgPsMPOi9rMcnFOJGOEA,6330
 retracesoftware/install/globals.py,sha256=F8XvIoZQQ10gSRalk30dvdKllxlwxkaggYY6FogLDxY,510
 retracesoftware/install/install.py,sha256=HCD_ji8XCr96b5fNzNdL_8qcEp0Jf05Em7T6GA6u8HU,4969
-retracesoftware/install/patcher.py,sha256=5tRC8XmJW0_loqX1Nqad1rkG--LlX46YwgbbMTbgASc,17598
+retracesoftware/install/patcher.py,sha256=aDFSUfR8ZWAkLKm5xMuilTxtQ9-uUrHeFHZmozMkRSU,18756
 retracesoftware/install/predicate.py,sha256=tX7NQc0rGkyyHYO3mduYHcJHbw1wczT53m_Dpkzo6do,2679
 retracesoftware/install/record.py,sha256=tseF_jV4k4HLPTgBPJdjcahl4EQqagoiisMAdGNC52Q,3257
 retracesoftware/install/references.py,sha256=A-G651IDOfuo00MkbAdpbIQh_15ChvJ7uAVTSmE6zd4,1721
@@ -15,13 +15,13 @@ retracesoftware/install/typeutils.py,sha256=_a1PuwdCsYjG1Nkd77V-flqYtwbD4RkJVKn6
 retracesoftware/proxy/__init__.py,sha256=ZlDZIuUmKFsE9Tvfd2EKGabTepqv8nrbr5pQhCM3IKc,193
 retracesoftware/proxy/gateway.py,sha256=xESohWXkiNm4ZutU0RgWUwxjxcBWRQ4rQyxIGQXv_F4,1590
 retracesoftware/proxy/proxyfactory.py,sha256=qhOqDfMJnLDNkQs26JqDB431MwjjRhGQi8xupJ45asg,12272
-retracesoftware/proxy/proxysystem.py,sha256=W2v0Tj0tJeAt_bg9LljQm2iwWpjNIbqUTQ92WK22TF8,6861
-retracesoftware/proxy/proxytype.py,sha256=0jbiH8DWgyf7GCPpJMxSzWKvE7kyw1l7SSR7fIXkKDc,12389
-retracesoftware/proxy/record.py,sha256=ZsJV0o-Qy874VFObtsfkSF8u9gvyUSee0UPpf9Jq6Es,7734
+retracesoftware/proxy/proxysystem.py,sha256=F0YSsF6BlDjWrjiApfy12GBopD647ML-UXP8Ovn_CL8,6953
+retracesoftware/proxy/proxytype.py,sha256=nwOhAqcVIG4h9uonXWBvQidKSbF4YSuMzrGJFlonk0s,12595
+retracesoftware/proxy/record.py,sha256=Ukjrzsv7WMA-2oC6Ji-JgIr0R8pRLyQGkHc8grzKtpE,8000
 retracesoftware/proxy/replay.py,sha256=RVsezEZcy4bFdPQAAztfEHz6adm8t5lBDMhpnNAqeok,10510
 retracesoftware/proxy/stubfactory.py,sha256=UnRDQHgWv2xTYaMPZPXvsa7WBh10CyItc_hsQdtOhcM,4607
 retracesoftware/proxy/thread.py,sha256=-SvnyVbANkmX2lLRpOvFtkpdpAoF6DhnnYdOOs7Q8vo,1379
-retracesoftware_proxy-0.1.6.dist-info/METADATA,sha256=NrUK4_HsArWTs-zDxMXZ5GRD3bEw8iOsbb_mpvl8Mfg,202
-retracesoftware_proxy-0.1.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-retracesoftware_proxy-0.1.6.dist-info/top_level.txt,sha256=hYHsR6txLidmqvjBMITpIHvmJJbmoCAgr76-IpZPRz8,16
-retracesoftware_proxy-0.1.6.dist-info/RECORD,,
+retracesoftware_proxy-0.1.8.dist-info/METADATA,sha256=MiCu-FDSk5wmZv30Kz-R-A8UKJxP-0sLHent41c__5o,202
+retracesoftware_proxy-0.1.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+retracesoftware_proxy-0.1.8.dist-info/top_level.txt,sha256=hYHsR6txLidmqvjBMITpIHvmJJbmoCAgr76-IpZPRz8,16
+retracesoftware_proxy-0.1.8.dist-info/RECORD,,