revisit 0.0.12__py2.py3-none-any.whl → 0.0.13__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-0.0.12.dist-info → revisit-0.0.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: revisit
-Version: 0.0.12
+Version: 0.0.13
 Requires-Dist: altair[all]>=5.5.0
 Requires-Dist: anywidget
 Requires-Dist: ipykernel>=6.29.5

{revisit-0.0.12.dist-info → revisit-0.0.13.dist-info}/RECORD

@@ -1,10 +1,10 @@
 revisit/StudyConfigSchema.json,sha256=xtzwZifuPJoiHASx0o8PHqBuh5L30mjBlhQ5eqsYm10,132168
 revisit/__init__.py,sha256=QCvYt8m9QwpjcK4dv6GlLMUDCzRXGy16cua1r2biNCg,255
 revisit/models.py,sha256=FRy8IlUAtDS3gdmZwwvqR935lbViTPnnr7k0CAkDkzI,134084
-revisit/revisit.py,sha256=MnXxWXi2k-hT8BzvFNcigURw5ZCJFJvxBq0fJoK865I,26505
+revisit/revisit.py,sha256=ZJDKbaQqvMTatcBxO8l7LhQ-EBb-2A_RKinQTIJe58k,26864
 revisit/widget.py,sha256=VvFqRvvvn86fW8ASe1pxaAvh5ZLvvSRThI5XtlCdgcg,915
 revisit/static/widget.css,sha256=TLu5F6k0CvowQtmApPswG-JZUXYszo7a10dVWKnZsIg,647
 revisit/static/widget.js,sha256=G5J9A5HvuMEEPKz2hAUGG25jFz4KHemocGLnJgwF_b8,186472
-revisit-0.0.12.dist-info/METADATA,sha256=Qgm7xz677b8fAyNNYrRKpGyR612mbpPH1TVrzAlc5vQ,8914
-revisit-0.0.12.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-revisit-0.0.12.dist-info/RECORD,,
+revisit-0.0.13.dist-info/METADATA,sha256=SoINQTeJwTFfaKiW2mpn9KhNXC4DT8Ew6lk3AWU59aM,8914
+revisit-0.0.13.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+revisit-0.0.13.dist-info/RECORD,,