revisit 0.0.15__py2.py3-none-any.whl → 0.0.17__py2.py3-none-any.whl

revisit/revisit.py

@@ -10,8 +10,7 @@ import re
 import os
 import shutil
 from . import widget as _widget
-import ast
-import time
+
 
 __all__ = [
     "component",
@@ -170,6 +169,16 @@ class _WrappedComponentBlock(_JSONableBaseModel):
         numSamples: Optional[int] = None,
         component_function=None
     ) -> None:
+
+        # Initialize components list with blank component if empty
+        make_comp_block = True
+        if len(self.component_objects__) == 0:
+            self = self + __component__(type='questionnaire', component_name__='place-holder-component')
+        # If there only exists one component (either existing one or placeholder),
+        # do not create the first component blocks.
+        if len(self.component_objects__)  == 1:
+            make_comp_block = False
+
         # Convert to JSON
         self_json = json.loads(self.__str__())
         # Get all current component dictionaries
@@ -181,7 +190,8 @@ class _WrappedComponentBlock(_JSONableBaseModel):
             order=order,
             numSamples=numSamples,
             input_components=components_dict,
-            component_function=component_function
+            component_function=component_function,
+            make_comp_block=make_comp_block
         )
         # Set new objects
         self.component_objects__ = new_permuted_component_block.component_objects__
@@ -450,7 +460,6 @@ def widget(study: _WrappedStudyConfig, revisitPath: str):
     extracted_paths = []
 
     for component in study.root.components.values():
-        print(component.root)
         actual_component = component.root
         if hasattr(actual_component, 'root'):
             actual_component = actual_component.root
@@ -701,11 +710,12 @@ def _recursive_json_permutation(
     input_json: dict,
     factors: List[str],
     order: rvt_models.Order,
-    numSamples: int,
     input_components: dict,
-    component_function=None
+    numSamples: Optional[int] = None,
+    component_function=None,
+    make_comp_block=True
 ):
-    new_seq = __sequence__(order=order, numSamples=numSamples)
+    new_seq = __sequence__(order=input_json['order'], numSamples=input_json.get('numSamples'))
     while input_json['components']:
         c = input_json['components'].pop()
         # If component name
@@ -750,5 +760,9 @@ def _recursive_json_permutation(
             curr_seq.root.order = new_input_json['order']
             curr_seq.root.numSamples = temp_num_samples
         new_seq = new_seq + curr_seq
-    return new_seq
-        
+
+    # Only return curr sequence if not making the comp block.
+    if make_comp_block is True:
+        return new_seq
+    else:
+        return curr_seq

{revisit-0.0.15.dist-info → revisit-0.0.17.dist-info}/METADATA

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

{revisit-0.0.15.dist-info → revisit-0.0.17.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=yx6WApoJ0M5B0jPf6vsNVSgt7mWbm2BVfpEiQLHbQ4Q,27045
+revisit/revisit.py,sha256=EMumwz59lFXXWD_Tv10VKVoGSNGj1ZhGjbZjD2osbUc,27708
 revisit/widget.py,sha256=VvFqRvvvn86fW8ASe1pxaAvh5ZLvvSRThI5XtlCdgcg,915
 revisit/static/widget.css,sha256=GlTPXc8vQmM78wYzPsTppy3r_zOqG7sqY1hKSmmmZNk,2769
 revisit/static/widget.js,sha256=g1wG7qkotTDfDJ3F91jluJGQknDvYR3aL5DTrsOdY5w,1358091
-revisit-0.0.15.dist-info/METADATA,sha256=slQt5etPsvwsVEJGX-mRRQXuOzv26oMIYdfsizaCy58,8943
-revisit-0.0.15.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-revisit-0.0.15.dist-info/RECORD,,
+revisit-0.0.17.dist-info/METADATA,sha256=5clOydYRA8ZkEZyFKm-YDRYmBJpAF7kuoTMn2idFAgA,8943
+revisit-0.0.17.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+revisit-0.0.17.dist-info/RECORD,,