retracesoftware-proxy 0.1.2__py3-none-any.whl → 0.1.3__py3-none-any.whl

retracesoftware/install/install.py

@@ -100,12 +100,6 @@ def replaying_proxy_factory(thread_state, is_immutable_type, tracer, next, bind,
             on_result = tracer('proxy.int.result'),
             on_error = tracer('proxy.int.error'),
             function = handler)
-
-    def foo(cls):
-        print(f"IN FOO {cls}")
-        inst = utils.create_stub_object(cls)
-        print(f'FOO {cls} {type(inst)}')
-        return inst
     
     # def is_stub_type(obj):
     #     return type(obj) == type and issubclass(obj, (WrappingProxy, ExtendingProxy))
@@ -113,7 +107,7 @@ def replaying_proxy_factory(thread_state, is_immutable_type, tracer, next, bind,
     def is_stub_type(obj):
         return type(obj) == type
 
-    create_stubs = functional.walker(functional.when(is_stub_type, foo))
+    create_stubs = functional.walker(functional.when(is_stub_type, utils.create_stub_object))
     # create_stubs = functional.walker(functional.when(is_stub_type, utils.create_stub_object))
 
     def wrap_ext_call(handler):

retracesoftware/install/patcher.py

@@ -96,7 +96,7 @@ def container_replace(container, old, new):
             container_replace(container, old, new)
         else:
             for key,value in container.items():
-                if value is old:
+                if key != '__retrace_unproxied__' and value is old:
                     container[key] = new
         return True
     elif isinstance(container, list):
@@ -462,7 +462,7 @@ class ImmutableTypes(set):
 
     def __contains__(self, item):
         assert isinstance(item, type)
-        
+
         if super().__contains__(item):
             return True
 

retracesoftware/install/references.py

@@ -31,7 +31,8 @@ def replace(container, old, new):
             replace(container, old, new)
         else:
             for key,value in container.items():
-                if value is old:
+                if key != '__retrace_unproxied__' and value is old:
+                    print(f'FOO replacing: {key} {old} {new}')
                     container[key] = new
                     
     elif isinstance(container, list):

retracesoftware/install/replay.py

@@ -35,7 +35,7 @@ def replay_system(thread_state, immutable_types, config):
 
     recording_path = Path(latest_from_pattern(config['recording_path']))
 
-    print(f"replay running against path: {recording_path}")
+    # print(f"replay running against path: {recording_path}")
 
     globals.recording_path = globals.RecordingPath(recording_path)
 

retracesoftware/proxy/proxysystem.py

@@ -123,7 +123,6 @@ class ProxySystem:
                 bind = self.bind)
 
     def dynamic_ext_proxytype(self, cls):
-        print(f'dynamic_ext_proxytype: {cls} {self.thread_state.value}')
 
         proxytype = dynamic_proxytype(
             handler = self.ext_dispatch,
@@ -176,27 +175,23 @@ class ProxySystem:
         assert not isinstance(obj, Proxy)
         assert not isinstance(obj, utils.wrapped_function)
             
-        try:
-            print(f'STARTING PROXYING: {obj}')
-            if type(obj) == type:
-                if obj in self.immutable_types or issubclass(obj, tuple):
-                    return obj
-                
-                return self.ext_proxytype(obj)
-                
-            elif type(obj) in self.immutable_types:
+        if type(obj) == type:
+            if obj in self.immutable_types or issubclass(obj, tuple):
                 return obj
             
-            elif is_function_type(type(obj)):
-
-                return self.thread_state.dispatch(
-                    obj, 
-                    internal = self.proxy_function(obj))
+            return self.ext_proxytype(obj)
             
-            else:
-                proxytype = dynamic_proxytype(handler = self.ext_dispatch, cls = type(obj))
+        elif type(obj) in self.immutable_types:
+            return obj
+        
+        elif is_function_type(type(obj)):
+
+            return self.thread_state.dispatch(
+                obj, 
+                internal = self.proxy_function(obj))
+        
+        else:
+            proxytype = dynamic_proxytype(handler = self.ext_dispatch, cls = type(obj))
 
-                return utils.create_wrapped(proxytype, obj)
-                # raise Exception(f'object {obj} was not proxied as its not a extensible type and is not callable')
-        finally:
-            print(f'FINISHED PROXYING: {obj}')
+            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

@@ -196,8 +196,6 @@ class ExtendingDescriptorProxy:
 
 def dynamic_proxytype(handler, cls):
 
-    print(f'Creating dynamic_proxytype from {cls} {cls.__dict__}')
-
     assert not issubclass(cls, Proxy)
     assert not issubclass(cls, BaseException)
 
@@ -209,10 +207,7 @@ def dynamic_proxytype(handler, cls):
         if name not in blacklist:
             value = getattr(cls, name)
             if is_descriptor(value):
-                print(f'Adding: {name} {value} {type(value).__mro__}')
-
                 if utils.is_method_descriptor(value):
-                    print(f'Adding method descriptor: {name} {value}')
                     spec[name] = utils.wrapped_function(handler = handler, target = value)
                 else:
                     spec[name] = DescriptorProxy(handler = handler, target = value)
@@ -254,8 +249,6 @@ def dynamic_from_extended(cls):
     target_type = functional.sequence(utils.unwrap, functional.typeof)
     spec['__class__'] = property(target_type)
     
-    print(f'dynamic_from_extended {spec}')
-
     return type(name, (utils.Wrapped, DynamicProxy), spec)
 
 
@@ -269,8 +262,6 @@ def instantiable_dynamic_proxytype(handler, cls, thread_state, create_stub = Fal
         return instance
     
     def __new__(proxytype, *args, **kwargs):
-        print(f'instantiable_dynamic_proxytype: {cls}')
-
         instance = utils.create_stub_object(cls) if create_stub else cls(*args, **kwargs)
         return utils.create_wrapped(proxytype, instance)
 
@@ -317,19 +308,24 @@ blacklist = ['__getattribute__', '__hash__', '__del__', '__dict__']
 #     cls.__new__ = thread_state.dispatch(unproxied__new__, internal = proxied__new__)
 
 def create_unproxied_type(cls):
-
     def unproxy_type(cls):
         return cls.__dict__.get('__retrace_unproxied__', cls)
 
-    return type(cls.__name__, tuple(map(unproxy_type, cls.__bases__)), dict(cls.__dict__))
+    bases = tuple(map(unproxy_type, cls.__bases__))
+    slots = dict(cls.__dict__)
+    del slots['__init_subclass__']
+    return type(cls.__name__, tuple(bases), slots)
 
 def extending_proxytype(cls, base, thread_state, ext_handler, int_handler, on_subclass_new):
 
+    # assert cls is base
     assert not issubclass(cls, BaseException)
+    assert not issubclass(cls, ExtendingProxy)
 
     def init_subclass(subclass, **kwargs):
-        # print(f'In init_subclass: {subclass} {kwargs}')
-        subclass.__retrace_unproxied__ = create_unproxied_type(subclass)
+        print(f'In init_subclass: {subclass} {kwargs}')
+        unproxied = create_unproxied_type(subclass)
+        subclass.__retrace_unproxied__ = unproxied
 
         proxy_method_descriptors(cls = subclass, handler = int_handler)
 
@@ -337,6 +333,8 @@ def extending_proxytype(cls, base, thread_state, ext_handler, int_handler, on_su
             subclass.__new__ = functional.sequence(subclass.__new__, functional.side_effect(on_subclass_new))
             subclass.__bases__ = subclass.__bases__ + (InternalProxy,)
 
+        assert not issubclass(subclass.__retrace_unproxied__, ExtendingProxy)
+
     slots = { "__slots__": (), 
               "__retrace_unproxied__": cls,
               "__module__": cls.__module__,
@@ -353,6 +351,8 @@ def extending_proxytype(cls, base, thread_state, ext_handler, int_handler, on_su
             elif is_descriptor(value):
                 descriptors.append(name)
 
+    slots['__retrace_unproxied__'] = cls
+
     extended = type(cls.__name__, (base, ExtendingProxy), slots)
 
     for name in descriptors:
@@ -364,56 +364,9 @@ def extending_proxytype(cls, base, thread_state, ext_handler, int_handler, on_su
       
     extended.__new__ = thread_state.dispatch(unproxied__new__, internal = base.__new__)
 
-    return extended
-
-
-# def stubtype(cls, result, thread_state, handler):
-    
-#     name = f'retrace.stub.{cls.__module__}.{cls.__name__}'
-
-#     slots = {}
-
-#     def wrap(name):
-#         return utils.wrapped_function(
-#             handler = handler, 
-#             target = StubMethodDescriptor(name = name, result = result))
-
-#     for name,value in superdict(cls).items():
-#         if name not in blacklist:
-#             if is_method_descriptor(value):
-#                 slots[name] = wrap(name)
-#             elif is_descriptor(value):
-#                 slots[name] = DescriptorStub(handler = handler, name = name)
-
-#     def disabled__new__(subcls, *args, **kwargs):
-#         instance = cls.__new__(subcls.__retrace_unproxied__, *args, **kwargs)
-#         instance.__init__(*args, **kwargs)
-#         return instance
+    assert not issubclass(extended.__retrace_unproxied__, ExtendingProxy)
+    assert extended.__dict__['__retrace_unproxied__'] is extended.__retrace_unproxied__
+    print(f'FOO: {extended} {id(extended)} {id(extended.__retrace_unproxied__)}')
+    # breakpoint()
 
-#     stub = type(name, (Stub,), slots)
-
-#     stub.__new__ = thread_state.dispatch(disabled__new__, internal = stub.__new__, external = stub.__new__)
-
-#     stub.__retrace_unproxied__ = cls
-
-#     return stub
-
-
-
-
-
-# def make_extensible(cls, handler, on_new):
-
-#     cls.__retrace_unproxied__ = cls.__base__
-
-#     def init_subclass(*args, **kwargs):
-#         print(f'In init_subclass: {args} {kwargs}')
-#         # subclass.__retrace_unproxied__ = create_unproxied_type(subclass)
-
-#         # proxy_method_descriptors(cls = subclass, handler = handler)
-
-#         # if not issubclass(subclass, InternalProxy):
-#         #     cls.__new__ = functional.compose(cls.__new__, functional.side_effect(on_new))
-#         #     cls.__bases__ = cls.__bases__ + (InternalProxy,)
-
-#     cls.__init_subclass__ = init_subclass
+    return extended

retracesoftware/proxy/record.py

@@ -84,10 +84,10 @@ class RecordProxySystem(ProxySystem):
 
         self.writer = stream.writer(path)
         
-        w = self.writer.handle('TRACE')
-        def trace_writer(*args):
-            print(f'Trace: {args}')
-            w(*args)
+        # w = self.writer.handle('TRACE')
+        # def trace_writer(*args):
+        #     print(f'Trace: {args}')
+        #     w(*args)
 
         self.extended_types = {}
         self.bindings = utils.id_dict()
@@ -110,7 +110,7 @@ class RecordProxySystem(ProxySystem):
 
         def watch(f): return functional.either(thread_switch_monitor, f)
 
-        tracer = Tracer(tracing_config, writer = trace_writer)
+        tracer = Tracer(tracing_config, writer = self.writer.handle('TRACE'))
 
         self.wrap_int_to_ext = watch
         

retracesoftware/proxy/replay.py

@@ -25,7 +25,6 @@ class ReplayError(RetraceError):
 class ReplayProxySystem(ProxySystem):
     
     def stubtype(self, cls):
-        print(f'In stubtype, class: {cls}')
         assert not issubclass(cls, Proxy)
 
         return dynamic_proxytype(handler = self.ext_handler, cls = cls)
@@ -63,7 +62,6 @@ class ReplayProxySystem(ProxySystem):
                 err_value = self.messages()
                 utils.raise_exception(err_type, err_value)
             else:
-                if type(next) is str: print('FOOBAR!!!!')
                 assert type(next) is not str
                 return next
 

retracesoftware/proxy/stubfactory.py

@@ -105,7 +105,6 @@ class StubFactory:
 
     def create_stubtype(self, spec):
 
-        print(f'FOOO: {spec.module}')
         slots = {
             '__module__': spec.module,
             '__qualname__': spec.name,

{retracesoftware_proxy-0.1.2.dist-info → retracesoftware_proxy-0.1.3.dist-info}/METADATA

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

{retracesoftware_proxy-0.1.2.dist-info → retracesoftware_proxy-0.1.3.dist-info}/RECORD

@@ -4,24 +4,24 @@ retracesoftware/install/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 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=nHnXjLnZDcY2untKR7BsPJEAcwoHfvXqgCmdHLiwRPE,5104
-retracesoftware/install/patcher.py,sha256=Bqr1uwo7Kh4a1VASUfiAd0N7CI40GGyxuH6Zv9c5ir8,17259
+retracesoftware/install/install.py,sha256=HCD_ji8XCr96b5fNzNdL_8qcEp0Jf05Em7T6GA6u8HU,4969
+retracesoftware/install/patcher.py,sha256=zSDmaVmgwTteF-ysMjHFbum793mt93J0gVHDOnYg2uM,17286
 retracesoftware/install/predicate.py,sha256=tX7NQc0rGkyyHYO3mduYHcJHbw1wczT53m_Dpkzo6do,2679
 retracesoftware/install/record.py,sha256=tseF_jV4k4HLPTgBPJdjcahl4EQqagoiisMAdGNC52Q,3257
-retracesoftware/install/references.py,sha256=0nUY_9BkeFz2imcw97rcJNq2jqISCB8dysBbCrh1eCo,1623
-retracesoftware/install/replay.py,sha256=SV7-k05xZFiNfBaxrlLrqbB8-i01IPvnJQjRj9zuinI,1828
+retracesoftware/install/references.py,sha256=A-G651IDOfuo00MkbAdpbIQh_15ChvJ7uAVTSmE6zd4,1721
+retracesoftware/install/replay.py,sha256=VUiHvQK3mgAJEGmtE2TFs9kXzxdWtsjibEcGkhZVCVE,1830
 retracesoftware/install/tracer.py,sha256=NFilwwtopDrEXjh4ZLkwyIgvPvzApQYC6BA78B11WTQ,4675
 retracesoftware/install/typeutils.py,sha256=_a1PuwdCsYjG1Nkd77V-flqYtwbD4RkJVKn6Z-xABL4,1813
 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=JZmi5EWI3B_l5zbq2KsFUTcD9bEsF3EjBhck_IiBmmE,6966
-retracesoftware/proxy/proxytype.py,sha256=XiCFDn6DeMoZ9tOq-VDZnsskkCfhJPSxrguIBxLWmws,13622
-retracesoftware/proxy/record.py,sha256=BGcYEzTXikHPIJXxhfITKA1uz0FcWIv92xfBheK-KCo,7480
-retracesoftware/proxy/replay.py,sha256=GHoXfCr-k23aKCOSjv0TH-nV-bJJ9l279dyTn5-982w,7949
-retracesoftware/proxy/stubfactory.py,sha256=RH4Xw9BTh_mPz81j6lmoRXfXm7RukxCxzk_H3se_shk,4152
+retracesoftware/proxy/proxysystem.py,sha256=eUYinugkA2EZgTkxcXcdDntQmK5HCQp5oOwRzfhosx4,6698
+retracesoftware/proxy/proxytype.py,sha256=iKN57FPRrACgYIFEDsCMvROA_tuhuGtZVguOxGlzVEE,12246
+retracesoftware/proxy/record.py,sha256=YEwfqldpb1MQGi6EngPxdbmjbCIjbz9EQCZuXubLSy4,7503
+retracesoftware/proxy/replay.py,sha256=4DxEuBlQSA6e-vB401JVfJV9Dgfesf5qbuBQBD-ApkA,7847
+retracesoftware/proxy/stubfactory.py,sha256=6dvDnbClDY1tDLIDvPYOPxuCIGsg3TYa1qf2SqrmAvg,4114
 retracesoftware/proxy/thread.py,sha256=-SvnyVbANkmX2lLRpOvFtkpdpAoF6DhnnYdOOs7Q8vo,1379
-retracesoftware_proxy-0.1.2.dist-info/METADATA,sha256=C2ZwqWsiW4Hs0HPbadhuecKiDB8etu9dfBGYrt7Q4q0,202
-retracesoftware_proxy-0.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-retracesoftware_proxy-0.1.2.dist-info/top_level.txt,sha256=hYHsR6txLidmqvjBMITpIHvmJJbmoCAgr76-IpZPRz8,16
-retracesoftware_proxy-0.1.2.dist-info/RECORD,,
+retracesoftware_proxy-0.1.3.dist-info/METADATA,sha256=J7wYAHin2b8ikm4VVMN9YfzRDZ9VEg43dpEbvqm0BXw,202
+retracesoftware_proxy-0.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+retracesoftware_proxy-0.1.3.dist-info/top_level.txt,sha256=hYHsR6txLidmqvjBMITpIHvmJJbmoCAgr76-IpZPRz8,16
+retracesoftware_proxy-0.1.3.dist-info/RECORD,,