jupyter-duckdb 1.1.3.1__tar.gz → 1.1.3.4__tar.gz

{jupyter_duckdb-1.1.3.1 → jupyter_duckdb-1.1.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: jupyter-duckdb
-Version: 1.1.3.1
+Version: 1.1.3.4
 Summary: a basic wrapper kernel for DuckDB
 Home-page: https://github.com/erictroebs/jupyter-duckdb
 Author: Eric Tröbs
@@ -15,6 +15,16 @@ Requires-Dist: jupyter
 Requires-Dist: graphviz==0.20.3
 Requires-Dist: checkmarkandcross
 Requires-Dist: duckdb==1.1.3
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # DuckDB Kernel for Jupyter
 

{jupyter_duckdb-1.1.3.1 → jupyter_duckdb-1.1.3.4}/setup.py

@@ -1,13 +1,7 @@
 import os
-import re
-from datetime import datetime
 
 from setuptools import setup, find_packages
 
-# version
-version = os.getenv('PACKAGE_VERSION', '1.0')
-version = re.sub(r'[^dev0-9._]', '', version)
-
 # install requires
 install_requires = [
     'jupyter',
@@ -25,7 +19,7 @@ with open('README.md', 'r', encoding='utf-8') as file:
 # main setup call
 setup(
     name='jupyter-duckdb',
-    version=version,
+    version=os.getenv('PACKAGE_VERSION', '1.0'),
     author='Eric Tröbs',
     author_email='eric.troebs@tu-ilmenau.de',
     description='a basic wrapper kernel for DuckDB',

{jupyter_duckdb-1.1.3.1 → jupyter_duckdb-1.1.3.4}/src/duckdb_kernel/kernel.py

@@ -1,3 +1,4 @@
+import csv
 import json
 import math
 import os
@@ -43,6 +44,7 @@ class DuckDBKernel(Kernel):
             MagicCommand('max_rows').arg('count').on(self._max_rows_magic),
             MagicCommand('query_max_rows').arg('count').on(self._query_max_rows_magic),
             MagicCommand('schema').flag('td').opt('only').on(self._schema_magic),
+            MagicCommand('store').arg('file').flag('noheader').result(True).on(self._store_magic),
             MagicCommand('ra').flag('analyze').code(True).on(self._ra_magic),
             MagicCommand('dc').code(True).on(self._dc_magic)
         )
@@ -434,6 +436,26 @@ class DuckDBKernel(Kernel):
 
         self.print_data(svg)
 
+    def _store_magic(self, silent: bool, result_columns: List[str], result: List[List], file: str, noheader: bool):
+        _, ext = file.rsplit('.', 1)
+
+        # csv
+        if ext == 'csv':
+            with open(file, 'w', encoding='utf-8') as f:
+                writer = csv.writer(f)
+
+                if not noheader:
+                    writer.writerow(result_columns)
+
+                for row in result:
+                    writer.writerow(row)
+
+            self.print(f'result stored to {file}', name='stderr')
+
+        # unsupported
+        else:
+            raise ValueError(f'extension {ext} not supported')
+
     def _ra_magic(self, silent: bool, code: str, analyze: bool):
         if self._db is None:
             raise AssertionError('load a database first')

{jupyter_duckdb-1.1.3.1 → jupyter_duckdb-1.1.3.4}/src/duckdb_kernel/magics/MagicCommandHandler.py

@@ -20,7 +20,7 @@ class MagicCommandHandler:
 
         while True:
             # ensure code starts with '%' or '%%' but not with '%%%'
-            match = re.match(r'^%{1,2}([^% ]+?)($| .+?$)', code, re.MULTILINE | re.IGNORECASE)
+            match = re.match(r'^%{1,2}([^% ]+?)([ \t]*$| .+?$)', code, re.MULTILINE | re.IGNORECASE)
 
             if match is None:
                 break

{jupyter_duckdb-1.1.3.1 → jupyter_duckdb-1.1.3.4}/src/jupyter_duckdb.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: jupyter-duckdb
-Version: 1.1.3.1
+Version: 1.1.3.4
 Summary: a basic wrapper kernel for DuckDB
 Home-page: https://github.com/erictroebs/jupyter-duckdb
 Author: Eric Tröbs
@@ -15,6 +15,16 @@ Requires-Dist: jupyter
 Requires-Dist: graphviz==0.20.3
 Requires-Dist: checkmarkandcross
 Requires-Dist: duckdb==1.1.3
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # DuckDB Kernel for Jupyter