more-compute 0.4.2__py3-none-any.whl → 0.4.3__py3-none-any.whl

{more_compute-0.4.2.dist-info → more_compute-0.4.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: more-compute
-Version: 0.4.2
+Version: 0.4.3
 Summary: An interactive notebook environment for local and GPU computing
 Home-page: https://github.com/DannyMang/MORECOMPUTE
 Author: MoreCompute Team

{more_compute-0.4.2.dist-info → more_compute-0.4.3.dist-info}/RECORD

@@ -63,11 +63,11 @@ frontend/public/fonts/Fira.ttf,sha256=dbSM4W7Drd9n_EkfXq8P31KuxbjZ1wtuFiZ8aFebvT
 frontend/public/fonts/Tiempos.woff2,sha256=h83bJKvAK301wXCMIvK7ZG5j0H2K3tzAfgo0yk4z8OE,13604
 frontend/public/fonts/VeraMono.ttf,sha256=2kKB3H2xej385kpiztkodcWJU0AFXsi6JKORTrl7NJ0,49224
 frontend/types/notebook.ts,sha256=v23RaZe6H3lU5tq6sqnJDPxC2mu0NZFDCJfiN0mgvSs,1359
-more_compute-0.4.2.dist-info/licenses/LICENSE,sha256=UQuJtJ2v98w8mXozOPmE8nkNc_8BFY-SVVBgTA327z0,1067
+more_compute-0.4.3.dist-info/licenses/LICENSE,sha256=UQuJtJ2v98w8mXozOPmE8nkNc_8BFY-SVVBgTA327z0,1067
 morecompute/__init__.py,sha256=pcMVq8Q7qb42AOn7tqgoZJOi3epDDBnEriiv2WVKnXY,87
-morecompute/__version__.py,sha256=6hfVa12Q-nXyUEXr6SyKpqPEDJW6vlRHyPxlA27PfTs,22
+morecompute/__version__.py,sha256=Nyg0pmk5ea9-SLCAFEIF96ByFx4-TJFtrqYPN-Zn6g4,22
 morecompute/cli.py,sha256=kVvzvPBqF8xO6UuhU_-TBn99nKwJ405R2mAS6zU0KBc,734
-morecompute/notebook.py,sha256=RubIXps925vCFgHznkW0QvvW0I11p6IGDDOrhnZ4jYs,6824
+morecompute/notebook.py,sha256=KGHORGAAZahT-TyX9HYuSc-b6TmfGgoi92FhRMK--Yg,7730
 morecompute/process_worker.py,sha256=KsE3r-XpkYGuyO4w3t54VKkD51LfNHAZc3TYattMtrg,7185
 morecompute/server.py,sha256=mcJwIvT9QHfpKuAq5jP2SW5hPjFB_rySevgQvOHuud8,41689
 morecompute/execution/__init__.py,sha256=jPmBmq8BZWbUEY9XFSpqt5FkgX04uNS10WnUlr7Rnms,134
@@ -88,16 +88,16 @@ morecompute/utils/cell_magics.py,sha256=YLxltTBprCA8jfgsjqf7Shnk4NCmGKIp3aV5_CYk
 morecompute/utils/config_util.py,sha256=I90om4Wf4BODc5Gy9u8Tu34AcqpkfkGAKQO6JE_NMzU,1940
 morecompute/utils/error_utils.py,sha256=e50WLFdD6ngIC30xAgrzdTYtD8tPOIFkKAAh_sPbK0I,11667
 morecompute/utils/line_magics.py,sha256=kTutYBPAWoURY_pk8HXQ38IP712M2rBBfUg3oN8VrP0,33740
-morecompute/utils/notebook_converter.py,sha256=aI9JdgPO8zpE0vYcBGlMEvQT2rLmZtjP_VD5bUn80bY,4229
+morecompute/utils/notebook_converter.py,sha256=_V-iG060Rr04oqk__cg1LbfV3C7uR1Rsh504WNZ218Q,9756
 morecompute/utils/notebook_util.py,sha256=3hH94dtXvhizRVTU9a2b38m_51Y4igoXpkjAXUqpVBQ,1353
-morecompute/utils/py_percent_parser.py,sha256=_CVB7uP8Qu8X_yIGKv-k3Lhpw7saH67VofYvRDfGGw8,5087
+morecompute/utils/py_percent_parser.py,sha256=c2AUOcXjGxmBWaYy0kk-pbNVzs-6YFagMVuVGQlYjY0,5388
 morecompute/utils/python_environment_util.py,sha256=l8WWWPwKbypknw8GwL22NXCji5i1FOy1vWG47J6og4g,7441
 morecompute/utils/shell_utils.py,sha256=fGFLhQLZU-lmMGALbbS-fKPkhQtmMhZ1FkgQ3TeoFhA,1917
 morecompute/utils/special_commands.py,sha256=nf2nVea5SyFqpulNYrnRx7anU4-G-e5_kLJ0PLtEi3Q,22030
 morecompute/utils/system_environment_util.py,sha256=32mQRubo0i4X61o-825T7m-eUSidcEp07qkInP1sWZA,4774
 morecompute/utils/zmq_util.py,sha256=tx7-iS04UN69OFtBzkxcEnRhT7xtI9EzRnrZ_nsH_O0,1889
-more_compute-0.4.2.dist-info/METADATA,sha256=_1hYq-pUsMBcYIn1zmoEZJFU1DLsk_0cuCjU32iJeSs,3869
-more_compute-0.4.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-more_compute-0.4.2.dist-info/entry_points.txt,sha256=xp7z9eRPNRM4oxkZZVlyXkhkSjN1AjoYI_B7qpDJ1bI,49
-more_compute-0.4.2.dist-info/top_level.txt,sha256=Tamm6ADzjwaQa1z27O7Izcyhyt9f0gVjMv1_tC810aI,32
-more_compute-0.4.2.dist-info/RECORD,,
+more_compute-0.4.3.dist-info/METADATA,sha256=U9KhKWUCeCulBSndkv55vtyDzwdIzKIt_VuHSt0Bh50,3869
+more_compute-0.4.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+more_compute-0.4.3.dist-info/entry_points.txt,sha256=xp7z9eRPNRM4oxkZZVlyXkhkSjN1AjoYI_B7qpDJ1bI,49
+more_compute-0.4.3.dist-info/top_level.txt,sha256=Tamm6ADzjwaQa1z27O7Izcyhyt9f0gVjMv1_tC810aI,32
+more_compute-0.4.3.dist-info/RECORD,,

morecompute/__version__.py

@@ -1 +1 @@
-__version__ = "0.4.2"
+__version__ = "0.4.3"

morecompute/notebook.py

@@ -3,6 +3,7 @@ from pathlib import Path
 from typing import List, Dict, Any
 from uuid import uuid4
 from .utils.py_percent_parser import parse_py_percent, generate_py_percent
+from .utils.notebook_converter import detect_colab_format, parse_colab_py
 
 class Notebook:
     """Manages the state of a notebook's cells."""
@@ -92,11 +93,29 @@ class Notebook:
 
             # Check file extension
             if path.suffix == '.py':
-                # Load .py file with py:percent format
+                # Load .py file - auto-detect format
                 with open(file_path, 'r', encoding='utf-8') as f:
                     content = f.read()
 
-                data = parse_py_percent(content)
+                # Detect if it's Colab format (docstrings) or py:percent format (# %%)
+                if detect_colab_format(content):
+                    print(f" Detected Colab format - auto-converting to py:percent")
+                    # Parse Colab format (docstrings as markdown)
+                    loaded_cells = parse_colab_py(content)
+                    data = {
+                        'cells': loaded_cells,
+                        'metadata': {
+                            'kernelspec': {
+                                'display_name': 'Python 3',
+                                'language': 'python',
+                                'name': 'python3'
+                            }
+                        }
+                    }
+                else:
+                    # Parse py:percent format (# %% markers)
+                    data = parse_py_percent(content)
+
                 loaded_cells = data.get('cells', [])
 
                 # Ensure stable IDs for all cells

morecompute/utils/notebook_converter.py

@@ -3,7 +3,7 @@
 import json
 import re
 from pathlib import Path
-from typing import List, Set
+from typing import List, Set, Dict
 from .py_percent_parser import generate_py_percent, parse_py_percent
 
 
@@ -97,10 +97,157 @@ def convert_ipynb_to_py(ipynb_path: Path, output_path: Path, include_uv_deps: bo
         print(f"  Run with: more-compute {output_path.name}")
 
 
+def detect_colab_format(content: str) -> bool:
+    """
+    Detect if a .py file is in Colab export format (docstrings as markdown).
+
+    Args:
+        content: Raw .py file content
+
+    Returns:
+        True if appears to be Colab format, False otherwise
+    """
+    # Check for actual cell markers (# %% at start of line)
+    # Must be ONLY # %% optionally followed by [markdown] or whitespace
+    # NOT # %%capture, # %%time, etc. (IPython magics)
+    has_cell_markers = bool(re.search(r'^\s*# %%\s*(?:\[markdown\])?\s*$', content, re.MULTILINE))
+
+    # If it has # %% markers, it's NOT Colab format (it's py:percent)
+    # Even if it has a Colab header comment!
+    if has_cell_markers:
+        return False
+
+    # Check for multi-line docstrings (Colab's markdown format)
+    has_docstrings = '"""' in content
+
+    # Colab format: has docstrings and no cell markers
+    return has_docstrings
+
+
+def parse_colab_py(content: str) -> List[Dict]:
+    """
+    Parse Colab-exported .py file into cell structure.
+
+    Colab format uses:
+    - Multi-line docstrings ('''..''' or \"\"\"...\"\"\") for markdown cells
+    - Regular Python code for code cells
+
+    Args:
+        content: Raw .py file content from Colab export
+
+    Returns:
+        List of cell dicts with 'cell_type' and 'source'
+    """
+    cells = []
+
+    # Split on docstring boundaries
+    # Pattern matches both ''' and """ with optional content
+    pattern = r'("""[\s\S]*?"""|\'\'\'[\s\S]*?\'\'\')'
+    parts = re.split(pattern, content)
+
+    for part in parts:
+        part = part.strip()
+        if not part:
+            continue
+
+        # Check if this is a docstring (markdown)
+        if (part.startswith('"""') and part.endswith('"""')) or \
+           (part.startswith("'''") and part.endswith("'''")):
+            # It's a markdown cell
+            # Remove the triple quotes
+            markdown_content = part[3:-3].strip()
+
+            # Skip empty markdown cells
+            if markdown_content:
+                cells.append({
+                    'cell_type': 'markdown',
+                    'source': markdown_content,
+                    'metadata': {}
+                })
+        else:
+            # It's a code cell
+            # Skip commented out code and special markers
+            if part and not part.startswith('# Commented out IPython magic'):
+                cells.append({
+                    'cell_type': 'code',
+                    'source': part,
+                    'metadata': {},
+                    'execution_count': None,
+                    'outputs': []
+                })
+
+    return cells
+
+
+def convert_colab_py_to_py_percent(input_path: Path, output_path: Path, include_uv_deps: bool = True) -> None:
+    """
+    Convert Colab-exported .py file to py:percent format (# %% markers).
+
+    Args:
+        input_path: Path to Colab .py file
+        output_path: Path to output .py file with # %% markers
+        include_uv_deps: Whether to extract and add UV inline script dependencies
+    """
+    # Read Colab .py file
+    with open(input_path, 'r', encoding='utf-8') as f:
+        content = f.read()
+
+    # Detect format
+    if not detect_colab_format(content):
+        print(f"Warning: {input_path.name} doesn't appear to be in Colab format")
+        print(f"  (Already has # %% markers or missing docstrings)")
+        return
+
+    # Parse Colab format into cells
+    cells = parse_colab_py(content)
+
+    if not cells:
+        print(f"Error: No cells found in {input_path.name}")
+        return
+
+    # Extract dependencies if requested
+    header_lines = []
+    if include_uv_deps:
+        # Create a temporary notebook structure to extract dependencies
+        temp_notebook = {'cells': cells}
+        dependencies = extract_pip_dependencies(temp_notebook)
+
+        if dependencies:
+            header_lines.append('# /// script')
+            header_lines.append('# dependencies = [')
+            for dep in sorted(dependencies):
+                header_lines.append(f'#   "{dep}",')
+            header_lines.append('# ]')
+            header_lines.append('# ///')
+            header_lines.append('')
+
+    # Generate py:percent format
+    py_content = generate_py_percent(cells)
+
+    # Combine header and content
+    if header_lines:
+        final_content = '\n'.join(header_lines) + '\n' + py_content
+    else:
+        final_content = py_content
+
+    # Write output
+    with open(output_path, 'w', encoding='utf-8') as f:
+        f.write(final_content)
+
+    print(f"✓ Converted Colab format {input_path.name} → {output_path.name}")
+    print(f"  Format: Colab docstrings → py:percent (# %%) markers")
+
+    if include_uv_deps and dependencies:
+        print(f"  Found dependencies: {', '.join(sorted(dependencies))}")
+        print(f"  Run with: more-compute {output_path.name}")
+
+
 def convert_py_to_ipynb(py_path: Path, output_path: Path) -> None:
     """
     Convert .py notebook to .ipynb format.
 
+    Automatically detects format (Colab, VSCode, JupyterLab).
+
     Args:
         py_path: Path to input .py file
         output_path: Path to output .ipynb file
@@ -109,8 +256,29 @@ def convert_py_to_ipynb(py_path: Path, output_path: Path) -> None:
     with open(py_path, 'r', encoding='utf-8') as f:
         py_content = f.read()
 
-    # Parse py:percent format to notebook structure
-    notebook_data = parse_py_percent(py_content)
+    # Detect format and parse accordingly
+    if detect_colab_format(py_content):
+        # Parse Colab format (docstrings as markdown)
+        cells = parse_colab_py(py_content)
+        notebook_data = {
+            'cells': cells,
+            'metadata': {
+                'kernelspec': {
+                    'display_name': 'Python 3',
+                    'language': 'python',
+                    'name': 'python3'
+                },
+                'language_info': {
+                    'name': 'python',
+                    'version': '3.8.0'
+                }
+            },
+            'nbformat': 4,
+            'nbformat_minor': 4
+        }
+    else:
+        # Parse py:percent format (# %% or # In[N]:)
+        notebook_data = parse_py_percent(py_content)
 
     # Ensure source is in list format (Jupyter notebook standard)
     for cell in notebook_data.get('cells', []):

morecompute/utils/py_percent_parser.py

@@ -8,6 +8,10 @@ def parse_py_percent(content: str) -> Dict:
     """
     Parse py:percent format Python file into notebook structure.
 
+    Supports multiple formats:
+        # %% - VSCode/PyCharm format
+        # In[N]: - JupyterLab export format
+
     Format:
         # %%
         code cell content
@@ -23,9 +27,15 @@ def parse_py_percent(content: str) -> Dict:
     """
     cells = []
 
-    # Split by cell markers (# %%)
-    # Keep the marker in the split to determine cell type
-    parts = re.split(r'(# %%.*?\n)', content)
+    # Check if using JupyterLab In[] format
+    has_in_markers = bool(re.search(r'# In\[\d+\]:', content))
+
+    if has_in_markers:
+        # Parse JupyterLab # In[N]: format
+        parts = re.split(r'(# In\[\d+\]:.*?\n)', content)
+    else:
+        # Parse VSCode # %% format
+        parts = re.split(r'(# %%.*?\n)', content)
 
     # First part before any cell marker (usually imports/metadata)
     if parts[0].strip():