revisit 0.0.12__py2.py3-none-any.whl → 0.0.14__py2.py3-none-any.whl

revisit/revisit.py

@@ -10,7 +10,8 @@ import re
 import os
 import shutil
 from . import widget as _widget
-
+import ast
+import time
 
 __all__ = [
     "component",
@@ -67,6 +68,7 @@ class _WrappedComponent(_JSONableBaseModel):
     component_name__: str
     base__: Optional[_WrappedComponent] = None
     context__: Optional[dict] = None
+    metadata__: Optional[dict] = None
     root: rvt_models.IndividualComponent
 
     def model_post_init(self, __context: Any) -> None:
@@ -158,18 +160,29 @@ class _WrappedComponentBlock(_JSONableBaseModel):
 
     def get_component(self, name: str) -> _WrappedComponent:
         for entry in self.component_objects__:
-            print(f'Comp Name: {entry.component_name__}')
-            print(f'Name: {name}')
             if entry.component_name__ == name:
                 return entry
 
-    def permute(self, factors: List[str], order: rvt_models.Order, numSamples: Optional[int] = None,) -> None:
+    def permute(
+        self,
+        factors: List[str],
+        order: rvt_models.Order,
+        numSamples: Optional[int] = None,
+        component_function=None
+    ) -> None:
         # Convert to JSON
         self_json = json.loads(self.__str__())
         # Get all current component dictionaries
         components_dict = {c.component_name__: c for c in self.component_objects__}
         # Recursively start permutation function
-        new_permuted_component_block = _recursive_json_permutation(self_json, factors=factors, order=order, numSamples=numSamples, input_components=components_dict)
+        new_permuted_component_block = _recursive_json_permutation(
+            self_json,
+            factors=factors,
+            order=order,
+            numSamples=numSamples,
+            input_components=components_dict,
+            component_function=component_function
+        )
         # Set new objects
         self.component_objects__ = new_permuted_component_block.component_objects__
         # Set new root
@@ -685,7 +698,8 @@ def _recursive_json_permutation(
     factors: List[str],
     order: rvt_models.Order,
     numSamples: int,
-    input_components: dict
+    input_components: dict,
+    component_function=None
 ):
     new_seq = __sequence__(order=order, numSamples=numSamples)
     while input_json['components']:
@@ -698,20 +712,22 @@ def _recursive_json_permutation(
             curr_seq = __sequence__(order=order, numSamples=numSamples)
             # Generate new comp for each
             for entry in factors:
-                # Split factor entry
-                [name, value] = entry.split(":")
                 # Assign params
-                new_params = {name: value}
-                if curr_comp.root.parameters is not None:
-                    new_params = {**curr_comp.root.parameters, **new_params}
+                metadata = entry
+                if curr_comp.metadata__ is not None:
+                    metadata = {**curr_comp.metadata__, **entry}
                 # Create new component
-                curr_comp = __component__(
-                    base__=curr_comp,
-                    component_name__=f"{c}__{entry}",
-                    parameters=new_params
-                )
+                comp_name = ":".join(f"{key}:{value}" for key, value in entry.items())
+                if component_function:
+                    new_comp = component_function(**metadata)
+                else:
+                    new_comp = __component__(
+                        base__=curr_comp,
+                        component_name__=f"{c}__{comp_name}",
+                        metadata__=metadata
+                    )
                 # Add to curr seq block
-                curr_seq = curr_seq + curr_comp
+                curr_seq = curr_seq + new_comp
             # Add seq block to outer seq block
         else:
             new_input_json = c
@@ -724,7 +740,8 @@ def _recursive_json_permutation(
                 order=order,
                 numSamples=numSamples,
                 input_components=input_components,
-                factors=factors
+                factors=factors,
+                component_function=component_function
             )
             curr_seq.root.order = new_input_json['order']
             curr_seq.root.numSamples = temp_num_samples

revisit/static/widget.css

@@ -1 +1,2 @@
 .revisit_notebook_widget button{background:#f0f0f0;border-radius:5px;border:1px solid #ccc;cursor:pointer;font-family:Roboto,sans-serif;font-size:1em;margin:5px;padding:5px 10px;transition:box-shadow .25s ease-in-out;&:hover{background:#e0e0e0;box-shadow:0 0 5px #ccc}&:active{background:#d0d0d0;box-shadow:0 0 5px #ccc inset}}.revisit_notebook_widget iframe{border:0;margin:0;width:100%}.revisit_notebook_widget{.sequence{width:100%;display:flex}.sequenceComponent{display:flex;padding-left:4px;padding-right:4px;padding-bottom:2px;&:hover{background:#0000001a}}.sequenceComponentIndividual{background:#000;width:5px;height:20px;margin-top:5px}}
+/*# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vanMvd2lkZ2V0LmNzcyJdLAogICJzb3VyY2VzQ29udGVudCI6IFsiLnJldmlzaXRfbm90ZWJvb2tfd2lkZ2V0IGJ1dHRvbiB7XG5cdGJhY2tncm91bmQ6ICNmMGYwZjA7XG5cdGJvcmRlci1yYWRpdXM6IDVweDtcblx0Ym9yZGVyOiAxcHggc29saWQgI2NjYztcblx0Y3Vyc29yOiBwb2ludGVyO1xuXHRmb250LWZhbWlseTogXCJSb2JvdG9cIiwgc2Fucy1zZXJpZjtcblx0Zm9udC1zaXplOiAxZW07XG5cdG1hcmdpbjogNXB4O1xuXHRwYWRkaW5nOiA1cHggMTBweDtcblx0dHJhbnNpdGlvbjogYm94LXNoYWRvdyAwLjI1cyBlYXNlLWluLW91dDtcblxuXHQmOmhvdmVyIHtcblx0XHRiYWNrZ3JvdW5kOiAjZTBlMGUwO1xuXHRcdGJveC1zaGFkb3c6IDAgMCA1cHggMCAjY2NjO1xuXHR9XG5cblx0JjphY3RpdmUge1xuXHRcdGJhY2tncm91bmQ6ICNkMGQwZDA7XG5cdFx0Ym94LXNoYWRvdzogMCAwIDVweCAwICNjY2MgaW5zZXQ7XG5cblx0fVxufVxuXG4ucmV2aXNpdF9ub3RlYm9va193aWRnZXQgaWZyYW1lIHtcblx0Ym9yZGVyOiAwO1xuXHRtYXJnaW46IDA7XG5cdHdpZHRoOiAxMDAlO1xufVxuXG4ucmV2aXNpdF9ub3RlYm9va193aWRnZXQge1xuXHQuc2VxdWVuY2Uge1xuXHRcdHdpZHRoOiAxMDAlO1xuXHRcdGRpc3BsYXk6IGZsZXg7XG5cdH1cblxuXHQuc2VxdWVuY2VDb21wb25lbnQge1xuXHRcdGRpc3BsYXk6IGZsZXg7XG5cdFx0cGFkZGluZy1sZWZ0OiA0cHg7XG5cdFx0cGFkZGluZy1yaWdodDogNHB4O1xuXHRcdHBhZGRpbmctYm90dG9tOiAycHg7XG5cblx0XHQmOmhvdmVyIHtcblx0XHRcdGJhY2tncm91bmQ6IHJnYmEoMCwwLDAsLjEpO1xuXHRcdH1cblx0fVxuXG5cdC5zZXF1ZW5jZUNvbXBvbmVudEluZGl2aWR1YWwge1xuXHRcdGJhY2tncm91bmQ6ICMwMDAwMDA7XG5cdFx0d2lkdGg6IDVweDtcblx0XHRoZWlnaHQ6IDIwcHg7XG5cdFx0bWFyZ2luLXRvcDogNXB4O1xuXHR9XG59Il0sCiAgIm1hcHBpbmdzIjogIkFBQUEsQ0FBQyx3QkFBd0IsT0FDeEIsV0FBWSxRQURiLGNBRWdCLElBQ2YsT0FBUSxJQUFJLE1BQU0sS0FDbEIsT0FBUSxRQUNSLFlBQWEsTUFBUSxDQUFFLFdBQ3ZCLFVBQVcsSUFOWixPQU9TLElBUFQsUUFRVSxJQUFJLEtBQ2IsV0FBWSxXQUFXLEtBQU0sWUFFN0IsQ0FBQyxPQUNBLFdBQVksUUFDWixXQUFZLEVBQUUsRUFBRSxJQUFNLElBQ3ZCLENBRUEsQ0FBQyxRQUNBLFdBQVksUUFDWixXQUFZLEVBQUUsRUFBRSxJQUFNLEtBQUssS0FFNUIsQ0FDRCxDQUVBLENBdkJDLHdCQXVCd0IsT0FDeEIsT0FBUSxFQXhCVCxPQXlCUyxFQUNSLE1BQU8sSUFDUixDQUVBLENBN0JDLHdCQThCQSxDQUFDLFNBQ0EsTUFBTyxLQUNQLFFBQVMsSUFDVixDQUVBLENBQUMsa0JBQ0EsUUFBUyxLQUNULGFBQWMsSUFDZCxjQUFlLElBQ2YsZUFBZ0IsSUFFaEIsQ0FBQyxPQUNBLFdBQVksU0FDYixDQUNELENBRUEsQ0FBQyw0QkFDQSxXQUFZLEtBQ1osTUFBTyxJQUNQLE9BQVEsS0FDUixXQUFZLEdBQ2IsQ0FDRCIsCiAgIm5hbWVzIjogW10KfQo= */