revisit 0.0.6__py2.py3-none-any.whl → 0.0.7__py2.py3-none-any.whl

revisit/revisit.py

@@ -7,6 +7,10 @@ from enum import Enum
 import csv
 from dataclasses import make_dataclass
 import re
+import os
+import shutil
+from . import widget as _widget
+
 
 __all__ = [
     "component",
@@ -15,7 +19,8 @@ __all__ = [
     "uiConfig",
     "studyMetadata",
     "studyConfig",
-    "data"
+    "data",
+    "widget"
 ]
 
 
@@ -115,13 +120,24 @@ class _WrappedComponentBlock(_JSONableBaseModel):
 
     def __add__(self, other):
         """Allows addition operator to append to sequence components list."""
-        if isinstance(other, _WrappedComponentBlock) or isinstance(other, _WrappedComponent):
+        if isinstance(other, _WrappedComponent):
             self.component_objects__.append(other)
             self.root.components.append(other.component_name__)
             return self
+        elif isinstance(other, _WrappedComponentBlock):
+            # Extend existing list of components with new set of components for tracking
+            self.component_objects__.extend(other.component_objects__)
+
+            # Add root object to components
+            self.root.components.append(other.root)
+            return self
         return NotImplemented
 
-    def from_data(self, data_list: list):
+    def from_data(self, data_list) -> DataIterator:
+        if not isinstance(data_list, list):
+            raise RevisitError(
+                message="'from_data' must take in a list of data rows. Use reVISit's 'data' method to parse a CSV file into a valid input."
+            )
         return DataIterator(data_list, self)
 
 
@@ -366,6 +382,67 @@ def data(file_path: str) -> List[Any]:
     return data_rows
 
 
+def widget(study: _WrappedStudyConfig, revisitPath: str):
+    if not os.path.isdir(revisitPath):
+        raise RevisitError(message=f'"{revisitPath}" does not exist.')
+
+    extracted_paths = []
+
+    for component in study.root.components.values():
+        if hasattr(component.root, 'path'):
+
+            fileName = component.root.path.split('/')[-1]
+
+            if component.root.type == 'react-component':
+                dest = f"{revisitPath}/src/public/__revisit-widget/assets/{fileName}"
+            else:
+                dest = f"{revisitPath}/public/__revisit-widget/assets/{fileName}"
+
+            extracted_paths.append({
+                "src": component.root.path,
+                "dest": dest
+            })
+
+            newPath = f"__revisit-widget/assets/{fileName}"
+            component.root.path = newPath
+
+    uiConfig = study.root.uiConfig
+    if uiConfig.helpTextPath is not None:
+
+        fileName = uiConfig.helpTextPath.split('/')[-1]
+        dest = f"{revisitPath}/public/__revisit-widget/assets/{fileName}"
+
+        extracted_paths.append({
+            "src": uiConfig.helpTextPath,
+            "dest": dest
+        })
+
+        newPath = f"__revisit-widget/assets/{fileName}"
+        uiConfig.helpTextPath = newPath
+
+    if uiConfig.logoPath is not None:
+
+        fileName = uiConfig.logoPath.split('/')[-1]
+
+        dest = f"{revisitPath}/public/__revisit-widget/assets/{fileName}"
+
+        extracted_paths.append({
+            "src": uiConfig.logoPath,
+            "dest": dest
+        })
+
+        newPath = f"__revisit-widget/assets/{fileName}"
+        uiConfig.logoPath = newPath
+
+    # Copy all files
+    for item in extracted_paths:
+        _copy_file(item['src'], item['dest'])
+
+    w = _widget.Widget()
+    w.config = json.loads(study.__str__())
+    return w
+
+
 # ------- PRIVATE FUNCTIONS ------------ #
 
 def _validate_component(kwargs: dict):
@@ -496,7 +573,7 @@ def pretty_error(errors):
 
 def _get_filtered_kwargs(class_type: Any, kwargs):
     try:
-        possible_items = get_args(class_type.__fields__.get('root').annotation)
+        possible_items = get_args(class_type.model_fields.get('root').annotation)
     except AttributeError:
         possible_items = [class_type]
 
@@ -529,3 +606,14 @@ def _extract_datum_value(text: str) -> str:
     if match:
         return match.group(1)  # Return the captured part (i.e., 'thing')
     return None  # Return None if the pattern doesn't match
+
+
+def _copy_file(src: str, dest: str):
+    # Check if file exists
+    if not os.path.exists(src):
+        raise RevisitError(message=f'File "{src}" not found.')
+
+    os.makedirs(os.path.dirname(dest), exist_ok=True)
+
+    print(f'Copying file from {src} to {dest}')
+    shutil.copyfile(src, dest)

revisit/widget.py

@@ -47,3 +47,7 @@ class Widget(anywidget.AnyWidget):
         self.internalWidget.value += 1
         # internalWidget.value += 1
         # print("{name} changed from {old} to {new}".format(**change))
+
+    # def set(self, study: rvt._WrappedStudyConfig):
+    #     self.config = json.loads(study.__str__())
+    #     return self

{revisit-0.0.6.dist-info → revisit-0.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: revisit
-Version: 0.0.6
+Version: 0.0.7
 Requires-Dist: anywidget
 Requires-Dist: ipykernel>=6.29.5
 Requires-Dist: pydantic>=2.10.5
@@ -58,3 +58,17 @@ yarn run dev
 Open `example.ipynb` in JupyterLab, VS Code, or your favorite editor
 to start developing. Changes made in `js/` will be reflected
 in the notebook.
+
+
+## CODE GEN
+
+```bash
+datamodel-codegen --input StudyConfigSchema.json --output models.py  --custom-template-dir custom_templates --output-model-type pydantic_v2.BaseModel --additional-imports typing.TypedDict --input-file-type jsonschema --special-field-name-prefix we_are_going_to_replace_this && sed -i '' 's/we_are_going_to_replace_this_//g'  src/revisit/models.py
+```
+
+## TESTS
+
+```bash
+cd revisit-py
+python -m unittest tests.test_module_one
+```

{revisit-0.0.6.dist-info → revisit-0.0.7.dist-info}/RECORD

@@ -1,9 +1,9 @@
 revisit/__init__.py,sha256=QCvYt8m9QwpjcK4dv6GlLMUDCzRXGy16cua1r2biNCg,255
 revisit/models.py,sha256=c-Hsd6XqeIP-hybH6MUovHG65XXueRhaMEVJZW1ViX0,120701
-revisit/revisit.py,sha256=U45q5nQtvfIBei6W9IaIIIWHoPP4ivZjxN4XqeR18uc,19305
-revisit/widget.py,sha256=ih0XhRjkih8vpeDr1SO8l8zMydZHLSXxVaFzvA8up_8,1722
+revisit/revisit.py,sha256=yYDzdaOw8t8bqNnhwbPhy8eRO62tHa6H4FGRECnPGXA,22001
+revisit/widget.py,sha256=qx1xehXLLYlSdR44lDJ_nnb5czljsvGFBZNEV79G77I,1850
 revisit/static/widget.css,sha256=TLu5F6k0CvowQtmApPswG-JZUXYszo7a10dVWKnZsIg,647
 revisit/static/widget.js,sha256=MlZ2jHlh_ADsUKMC5nZaSAmW73-4y2B57NcS3E5Jh3Q,187153
-revisit-0.0.6.dist-info/METADATA,sha256=1dA6YZT5iS8nYMryUJMWc9LPRyUfIbDSEXFcgHzYaw4,1261
-revisit-0.0.6.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-revisit-0.0.6.dist-info/RECORD,,
+revisit-0.0.7.dist-info/METADATA,sha256=8SdNZppKm4OeGvuBWOvXOcfx26SG8r4sDIeCkD70YvY,1712
+revisit-0.0.7.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+revisit-0.0.7.dist-info/RECORD,,