plainbook 0.0.8__py3-none-any.whl → 0.0.10__py3-none-any.whl

plainbook/plainbook.py

@@ -16,6 +16,22 @@ class ExecutionError(Exception):
     """Custom exception for execution errors in Plainbook."""
     pass
 
+def getlist(value):
+    """Utility to ensure a value is a list."""
+    if isinstance(value, list):
+        return value
+    else:
+        return [value]
+
+def tostring(value):
+    """Utility to ensure a value is a string."""
+    if isinstance(value, str):
+        return value
+    elif isinstance(value, list):
+        return "".join(value)
+    else:
+        return str(value)
+    
 class Plainbook(object):
     """This class implements an Plainbook and its operations."""
     
@@ -26,7 +42,9 @@ class Plainbook(object):
         self.nb = None
         self._lock = threading.Lock()
         self.last_executed_cell = -1
-        self.load_notebook()
+        self._load_notebook()
+        # Context for notebook processing.
+        self.input_files = []
         # Starts the kernel.
         self.km = KernelManager()
         self.km.start_kernel()
@@ -41,11 +59,20 @@ class Plainbook(object):
         # Register the cleanup function
         atexit.register(self._shutdown)
 
-    def load_notebook(self):
+    def _load_notebook(self):
         """Loads the notebook from the specified path. If the file is missing, create an empty notebook."""
         try:
             with open(self.path) as f:
                 self.nb = nbformat.read(f, as_version=4)
+                for cell in self.nb.cells:
+                    cell.source = tostring(cell.source)
+                    if cell.cell_type == 'code':
+                        if 'explanation' not in cell.metadata:
+                            cell.metadata['explanation'] = ""
+                        else:
+                            cell.metadata['explanation'] = tostring(cell.metadata['explanation'])
+                        if 'codegen' not in cell.metadata:
+                            cell.metadata['codegen'] = False                        
         except (FileNotFoundError, OSError):
             # Ensure parent directory exists
             parent = os.path.dirname(self.path) or "."
@@ -245,6 +272,7 @@ class Plainbook(object):
             else:
                 new_cell = nbformat.v4.new_code_cell(source="", execution_count=None, outputs=[])
                 new_cell.metadata['explanation'] = []
+                new_cell.metadata['codegen'] = False
             self.nb.cells.insert(index, new_cell)
             # Inserting code cells before the last executed cell requires resetting the kernel.
             if cell_type == 'code' and index <= self.last_executed_cell:
@@ -296,10 +324,12 @@ class Plainbook(object):
         """Sets the source code of a cell at the given index."""
         with self._lock:
             assert 0 <= index < len(self.nb.cells)
-            self.nb.cells[index].source = source
-            if self.nb.cells[index].cell_type == 'code':
+            cell = self.nb.cells[index]
+            cell.source = source
+            if cell.cell_type == 'code':
+                cell.metadata['codegen'] = False
                 # Reset outputs and execution count on code cell edit
-                self.nb.cells[index].outputs = []
+                cell.outputs = []
                 if index <= self.last_executed_cell:
                     # We need to restart. 
                     self._reset_kernel()
@@ -312,6 +342,7 @@ class Plainbook(object):
             cell = self.nb.cells[index]
             assert cell.cell_type == 'code'
             cell.metadata['explanation'] = explanation
+            cell.metadata['codegen'] = False
             self._write()
             
     # Methods to support AI
@@ -321,15 +352,16 @@ class Plainbook(object):
         Needs to be called with the lock held."""
         cell = self.nb.cells[index]
         if cell.cell_type == 'code':
-            explanation = cell.metadata.get('explanation', [])
-            explanation = ["# " + line for line in explanation]
-            explanation_text = "\n".join(explanation) + "\n"
-            code_text = "\n".join(cell.source)
-            return explanation_text + code_text
+            explanation = cell.metadata.get('explanation', "")
+            explanation = ["# " + line for line in explanation.splitlines(keepends=True)]
+            explanation_text = "".join(explanation) + "\n"
+            source_code = cell.source + "\n"
+            return explanation_text + source_code
         elif cell.cell_type == 'markdown':
-            return "\n".join(["# " + line for line in cell.source])
+            commented_lines = ["# " + line for line in cell.source.splitlines(keepends=True)]
+            return "".join(commented_lines) + "\n"
         else:
-            return ""
+            return "\n"
 
     def _get_code_for_ai(self, index):
         """Returns the concatenated source code of all previous code cells for context."""
@@ -346,21 +378,26 @@ class Plainbook(object):
             cell = self.nb.cells[index]
             assert cell.cell_type == 'code'
             instructions = cell.metadata.get('explanation')
+            files_context = self._get_files_context()
+            error_context = self._get_error_context(index)
             previous_code = self._get_code_for_ai(index)
             # Mark that an AI request is pending
             try:
-                new_code = gemini_generate_code(api_key, previous_code, instructions)
+                new_code = gemini_generate_code(
+                    api_key, previous_code=previous_code, instructions=instructions,
+                    file_context=files_context, error_context=error_context)
                 # If we are still in a request, update the cell.
                 if self.ai_request_pending:
                     cell.source = new_code
+                    cell.metadata['codegen'] = True
                     # Reset outputs and execution count
                     cell.outputs = []
                     if index <= self.last_executed_cell:
                         self._reset_kernel()
                     self._write()
-                    return new_code
+                    return new_code, True
                 else:
-                    return None
+                    return None, False
             finally:
                 self.ai_request_pending = False
 
@@ -400,3 +437,32 @@ class Plainbook(object):
                 cell.metadata['validation'] = {}
             cell.metadata['validation']['is_hidden'] = is_hidden
             self._write()
+
+    def set_input_files(self, files):
+        """Sets the input files for the notebook."""
+        self.input_files = files
+        
+    def _get_files_context(self):
+        """Builds the AI context including input files."""
+        context_parts = [
+            "Here is a list of file names and paths. "
+            "The user may mention input files; to access them, the full path should be used."
+            ]
+        for file in self.input_files:
+            context_parts.append(f"* File name: {file['name']} path: {file['path']}\n")
+        return "\n".join(context_parts) + "\n"
+    
+    def _get_error_context(self, cell_index):
+        """If the cell has an error, include its traceback as context."""
+        context_parts = [
+            "The previous attempt to run this cell resulted in this error traceback:"
+        ]
+        cell = self.nb.cells[cell_index]
+        if cell.cell_type != 'code':
+            return None
+        for output in reversed(getlist(cell.get('outputs', []))):
+            if output.output_type == 'error':
+                traceback = context_parts + getlist(output.get('traceback', []))
+                return "\n".join(traceback)
+        return None
+    

plainbook/views/index.html

@@ -29,100 +29,108 @@
     </style>
   </head>
   <body class="has-navbar-fixed-top">
+
+    <div id="app"></div>
     
     <script type="text/x-template" id="app-template">
 
-        <app-navbar 
-            :is-locked="isLocked"
-            :running="running"
-            :has-notebook="!!notebook"
-            :last-run-index="lastRunIndex"
-            :cell-count="notebook ? notebook.cells.length : 0"
-            :has-api-key="!!geminiApiKey"
-            @lock="lockNotebook"
-            @refresh="reloadNotebook"
-            @interrupt="interruptKernel"
-            @regenerate-all="regenerateAllCode"
-            @reset-run-all="resetAndRunAllCells"
-            @open-info="showInfo = true"
-            @open-settings="showSettings = true"
-        />    
+    <app-navbar 
+        :is-locked="isLocked"
+        :running="running"
+        :has-notebook="!!notebook"
+        :last-run-index="lastRunIndex"
+        :cell-count="notebook ? notebook.cells.length : 0"
+        :has-api-key="!!geminiApiKey"
+        @lock="lockNotebook"
+        @refresh="reloadNotebook"
+        @interrupt="interruptKernel"
+        @regenerate-all="regenerateAllCode"
+        @reset-run-all="resetAndRunAllCells"
+        @open-info="showInfo = true"
+        @open-settings="showSettings = true"
+    />    
 
-        <div v-if="uiError" class="notification mb-0 mt-0 px-4 pl-2 pr-6 has-text-danger has-background-danger-light" 
-            style="width: 100%; border-radius: 0; align-items: center; justify-content: space-between;">
-            <span><strong>Error:</strong> {{ uiError }}</span>
-            <button class="delete" @click="closeUiError"></button>
-        </div>
+    <input-file 
+        :auth-token="authToken"
+    />
+
+    <ui-error 
+        :error="uiError" 
+        @close="closeUiError" 
+    />
 
-        <div class="section notebook-area">
-            <h1 class="title">
-                {{ notebook_name }}
-            </h1>
-            <div class="notebook-container px-2 py-2">
-                <div v-if="loading" class="has-text-centered py-6">
-                    <button class="button is-loading is-ghost is-large">Loading</button>
-                    <p class="has-text-grey">Fetching notebook data...</p>
-                </div>
-                <div v-else-if="error" class="notification is-danger is-light">
-                    <button class="delete" @click="error = null"></button>
-                    <strong>Error:</strong> {{ error }}
-                </div>
-                <div v-else="notebook">
+    <div class="section notebook-area">
+        <h1 class="title">
+            {{ notebook_name }}
+        </h1>
+        <div class="notebook-container px-2 py-2">
+            <div v-if="loading" class="has-text-centered py-6">
+                <button class="button is-loading is-ghost is-large">Loading</button>
+                <p class="has-text-grey">Fetching notebook data...</p>
+            </div>
+            <div v-else-if="error" class="notification is-danger is-light">
+                <button class="delete" @click="error = null"></button>
+                <strong>Error:</strong> {{ error }}
+            </div>
+            <div v-else="notebook">
+                
+                <template v-for="(cell, index) in notebook.cells" :key="index">
 
                     <cell-insertion-zone v-if="!isLocked"
-                        @insert="(celltype) => insertCell(0, celltype)" 
+                        :is-last="false"
+                        @insert="(celltype) => insertCell(index, celltype)" 
+                    />
+                    
+                    <notebook-cell 
+                        :cell="cell"
+                        :is-active="activeIndex === index"
+                        :needs-running="index > lastRunIndex"
+                        :is-locked="isLocked"
+                        :last-run-index="lastRunIndex"
+                        :as-read="asRead"
+                        :markdown-edit-key="markdownEditKey[index]"
+                        :explanation-edit-key="explanationEditKey[index]"
+                        @click="setActiveCell(index)"
+                        
+                        @save-markdown="(content) => sendMarkdownToServer(content, index)"
+                        @save-explanation="(content) => sendExplanationToServer(content, index)"
+                        @save-code="(content) => sendCodeToServer(content, index)"
+                        @save-and-run="(content) => saveExplanationAndRun(content, index)"
+                        
+                        @run-cell="runCell(index)"
+                        @generate-code="generateCode(index)"
+                        @validate-code="validateCode(index)"
+                        @dismiss-validation="dismissValidation(index)"
+                        
+                        @delete="deleteCell(index)"
+                        @move-up="moveCell(index, -1)"
+                        @move-down="moveCell(index, 1)"
                     />
 
-                    <template v-for="(cell, index) in notebook.cells" :key="index">
-
-                        <notebook-cell 
-                            :cell="cell"
-                            :is-active="activeIndex === index"
-                            :needs-running="index > lastRunIndex"
-                            :is-locked="isLocked"
-                            :last-run-index="lastRunIndex"
-                            :as-read="asRead"
-                            :markdown-edit-key="markdownEditKey[index]"
-                            :explanation-edit-key="explanationEditKey[index]"
-                            @click="setActiveCell(index)"
-                            
-                            @save-markdown="(content) => sendMarkdownToServer(content, index)"
-                            @save-explanation="(content) => sendExplanationToServer(content, index)"
-                            @save-code="(content) => sendCodeToServer(content, index)"
-                            @save-and-run="(content) => saveExplanationAndRun(content, index)"
-                            
-                            @run-cell="runCell(index)"
-                            @generate-code="generateCode(index)"
-                            @validate-code="validateCode(index)"
-                            @dismiss-validation="dismissValidation(index)"
-                            
-                            @delete="deleteCell(index)"
-                            @move-up="moveCell(index, -1)"
-                            @move-down="moveCell(index, 1)"
-                        />
-
-                        <cell-insertion-zone v-if="!isLocked"
-                            @insert="(celltype) => insertCell(index + 1, celltype)" 
-                        />
-
-                    </template>
                     
-                </div>
+                </template>
+                
+                <cell-insertion-zone v-if="!isLocked"
+                    :is-last="true"
+                    @insert="(celltype) => insertCell(notebook.cells.length, celltype)" 
+                />
+
             </div>
         </div>
+    </div>
 
-        <!-- Settings Modal -->
-        <settings-modal 
-            :is-active="showSettings" 
-            :api-key="geminiApiKey" 
-            @close="showSettings = false" 
-            @save="(newKey) => {showSettings = false; saveSettings(newKey); }" 
-        />
-        <!-- Info Modal -->
-        <info-modal 
-            :is-active="showInfo" 
-            @close="showInfo = false" 
-        />
+    <!-- Settings Modal -->
+    <settings-modal 
+        :is-active="showSettings" 
+        :api-key="geminiApiKey" 
+        @close="showSettings = false" 
+        @save="(newKey) => {showSettings = false; saveSettings(newKey); }" 
+    />
+    <!-- Info Modal -->
+    <info-modal 
+        :is-active="showInfo" 
+        @close="showInfo = false" 
+    />
 
     </script>
     

{plainbook-0.0.8.dist-info → plainbook-0.0.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plainbook
-Version: 0.0.8
+Version: 0.0.10
 Summary: Plain Language Notebooks
 Author-email: Luca de Alfaro <dealfaro@acm.org>
 License-Expression: BSD-3-Clause

{plainbook-0.0.8.dist-info → plainbook-0.0.10.dist-info}/RECORD

@@ -1,10 +1,10 @@
 plainbook/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-plainbook/gemini.py,sha256=4lgvMdQdcKyMZLSnu9yhwlaI4LaSvvyr_-SA0DdI628,2915
-plainbook/main.py,sha256=XruVZYj-nQ-2V9wiGKO7AV0-Via0Rz2CUafuX1id3J8,10172
-plainbook/plainbook.py,sha256=zgi3e50r9vFfMLxXuMVcvyB9I7yEJOgZthxnz3RxuKw,17063
+plainbook/gemini.py,sha256=v0jCIE8MFQ7Fnctah9pV9YAkGHZ7E2vUAnKAPUQw_VA,3175
+plainbook/main.py,sha256=52rfzj-ZwnJu0ozadBDa7bINqvEK71M2OduiIf5LhIc,11693
+plainbook/plainbook.py,sha256=2PmEyfpShY1Gn_3-pApNyhXL-NidgyjH081AtPbmwjk,19808
 plainbook/css/font-awesome.css,sha256=NuCn4IvuZXdBaFKJOAcsU2Q3ZpwbdFisd5dux4jkQ5w,37414
 plainbook/css/font-awesome.min.css,sha256=eZrrJcwDc_3uDhsdt61sL2oOBY362qM3lon1gyExkL0,31000
-plainbook/css/main.css,sha256=HnC5t_S2JeKQtJctKZMQ-8la6vWHlUchi88P02h7kJ0,692270
+plainbook/css/main.css,sha256=sWH9Nanyr0pZwVQRkqV8-zQjrK602PrxNHgW0_15lU4,692344
 plainbook/css/prism.min.css,sha256=ko4j5rn874LF8dHwW29_xabhh8YBleWfvxb8nQce4Fc,1789
 plainbook/fonts/FontAwesome.otf,sha256=RE3UNmYV_8ShbQErL6kBNwZdPMtBD6b9Xk3de15P_NU,134808
 plainbook/fonts/fontawesome-webfont.eot,sha256=e_yrbbmdXPvxcFygU23ceFhUMsxfpBu9etDwCQM7KXk,165742
@@ -13,24 +13,26 @@ plainbook/fonts/fontawesome-webfont.ttf,sha256=qljzPyOaD7AvXHpsRcBD16msmgkzNYBml
 plainbook/fonts/fontawesome-webfont.woff,sha256=ugxZ3rVFD1y0Gz-TYJ7i0NmVQVh33foiPoqKdTNHTwc,98024
 plainbook/fonts/fontawesome-webfont.woff2,sha256=Kt78vAQefRj88tQXh53FoJmXqmTWdbejxLbOM9oT8_4,77160
 plainbook/js/AppNavbar.js,sha256=nEX2CXdI0136Usj-YVts6QXV4xd_vbsXh9-mPvgbi5E,3968
-plainbook/js/CellInsertionZone.js,sha256=XPo2hmuG9lfVzYbZ1bBO-44HiyCFngHzxoUa56v42s8,676
-plainbook/js/CodeCell.js,sha256=cK6YOKVu58g4h7KmH2aL3LA99oxe8Z3ZZpLRF0k6XZY,6943
-plainbook/js/ExplanationEditor.js,sha256=FDflmKZKzNHkKgXHwsYrbQDLDK1ROVg00-5p9cj2jlc,7088
-plainbook/js/InfoModal.js,sha256=ShylUmDQdQ-2g-z6PlvZ_TTlxCSdNGJJICu-RAAwab8,1442
+plainbook/js/CellInsertionZone.js,sha256=En2hItfUGdV5s2_vk41ovCkM8XLpIlLQ8wRNNmQAyzU,728
+plainbook/js/CodeCell.js,sha256=Xi7M0-0ew3_UJvPoJDJBsaf9PZ3MBKKdZ4nkMVODp-o,6959
+plainbook/js/ExplanationEditor.js,sha256=gPwe3fLKBy8dnprKloeCHYDgBh2znse6clacGWq0g-I,7444
+plainbook/js/InfoModal.js,sha256=t1Rjz658gfuoszoE0chfi2qFqJwmCgjlaYIeIATe_Nk,1436
+plainbook/js/InputFile.js,sha256=l93wGretLdu9iqcTdatTI3LQxEo-sTTi9phKPQC6zF0,7928
 plainbook/js/MarkdownCell.js,sha256=SxU_LO4TGcxOEy6sKognF_gHUXwmqR6BDsv4z0tlgVQ,5292
-plainbook/js/NotebookCell.js,sha256=PNWdd6VSWtD1nHeUCHPEZWIwBMQT26rjN6-P0rPCEZI,3239
+plainbook/js/NotebookCell.js,sha256=-HMSZlf287IEZJQSRCKv6u-9Yd2Wvq0DB4mEvWD5Jts,3677
 plainbook/js/OutputRenderer.js,sha256=KXECI2xd0Sk_TnZnAfqfhL0dEIT9pjZZTXo6Qdiw0o4,2981
 plainbook/js/SettingsModal.js,sha256=HpU2gKj26zZHhilcfp3hghEsW-sxsgq1HBlcsIBDGCI,1689
+plainbook/js/UiError.js,sha256=F3tQ3I66-3kbAsGlD9OVWWrRu9LNJ3QCSkr0tWX-R5w,439
 plainbook/js/ValidationCell.js,sha256=4XdlBNELTpeARiNVh55_7ay24CEY-aUNJy1knX8I9MU,1595
 plainbook/js/markdown-it.min.js,sha256=hNyljag6giCsjv_yKmxK8_VeHzvMDvc5u8AzmRvm1BI,103012
-plainbook/js/nb.js,sha256=CZs32sAevGsea7PUjJK0Prd-7_mz1G82_S9_Hpx5gmQ,22822
+plainbook/js/nb.js,sha256=xLQb5IDMe1Smpa1HsH2qgNnRCG9Cl51mRdyC8AoV5_k,23464
 plainbook/js/prism-python.min.js,sha256=7UOFaFvPLUk1yNu6tL3hZgPaEyngktK_NsPa3WfpqFw,2113
 plainbook/js/prism.min.js,sha256=57iL3cbHV7L8jLET4kaYAasUp47BqPraTWOR41c_X58,18997
 plainbook/js/vue.esm-browser.js,sha256=75FuLhUTPk19sncwNIrm0BGEL0_Qw298-_v01fPWYoI,542872
-plainbook/views/index.html,sha256=2LEoKQMoAuCwDSTg8kpstvINJUL33QTcfLkEspS1wYI,5557
-plainbook-0.0.8.dist-info/licenses/LICENSE.md,sha256=JW6Hp9mBeCkRkCSeiT2KmIU3XA5mJorjcIlM2cOOxyU,1462
-plainbook-0.0.8.dist-info/METADATA,sha256=oqeZaTNU720_qAR6HqaiCu6Kvmpd7pj8ofV1hxkvOvo,3023
-plainbook-0.0.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-plainbook-0.0.8.dist-info/entry_points.txt,sha256=fktud-zRh9ZZ4rXv5w6kW-78u44lSYklXY1ttMTB9k8,50
-plainbook-0.0.8.dist-info/top_level.txt,sha256=Y3jOV2n79dczNw9tJ7acufz3y3ns2pWw8b06sIN4ltc,10
-plainbook-0.0.8.dist-info/RECORD,,
+plainbook/views/index.html,sha256=hBuTsAh86BGUQxjyIQG1ZWTAsrOI3Rh6NNbppqze6Hc,5188
+plainbook-0.0.10.dist-info/licenses/LICENSE.md,sha256=JW6Hp9mBeCkRkCSeiT2KmIU3XA5mJorjcIlM2cOOxyU,1462
+plainbook-0.0.10.dist-info/METADATA,sha256=4lblvcP571gixqk-P7chUSKy-37nyUgMSWQotiPutDc,3024
+plainbook-0.0.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+plainbook-0.0.10.dist-info/entry_points.txt,sha256=fktud-zRh9ZZ4rXv5w6kW-78u44lSYklXY1ttMTB9k8,50
+plainbook-0.0.10.dist-info/top_level.txt,sha256=Y3jOV2n79dczNw9tJ7acufz3y3ns2pWw8b06sIN4ltc,10
+plainbook-0.0.10.dist-info/RECORD,,