@sap/cds-dk 6.2.2 → 6.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-dk",
-  "version": "6.2.2",
+  "version": "6.3.0",
   "description": "Command line client and development toolkit for the SAP Cloud Application Programming Model",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [
@@ -16,7 +16,7 @@
   },
   "main": "lib/index.js",
   "dependencies": {
-    "@sap/cds": "^6.2.0",
+    "@sap/cds": "^6.3.0",
     "@sap/cds-foss": "^4",
     "@sap/eslint-plugin-cds": "^2.6.0",
     "axios": ">=0.21",
@@ -34,7 +34,7 @@
     "xml-js": "^1.6.11"
   },
   "optionalDependencies": {
-    "@sap/cds-mtxs": "^1.2.0",
+    "@sap/cds-mtxs": "^1.3.0",
     "sqlite3": "^5.0.4"
   },
   "files": [

package/lib/init/template/notebook/cap_magic.py

@@ -1,118 +0,0 @@
-import os
-import platform
-import subprocess
-from threading import Thread
-from IPython import get_ipython
-from IPython.core.magic import (Magics, magics_class, cell_magic, line_magic)
-
-list_thread_cmds = [
-    'cds watch',
-    'cf login'
-]
-
-def start_thread_darwin(line):
-    list_thread_darwin = [
-        'printf \"#!/bin/bash',
-        'function finish {',
-        'rm notebook_thread.sh;'
-        '}',
-        'cd ' + os.getcwd(),
-        line,
-        'trap finish EXIT\" > notebook_thread.sh'
-    ]
-    thread_darwin = '\\n'.join(list_thread_darwin)
-    thread_darwin += ' && chmod +x notebook_thread.sh'
-    thread_darwin += ' && open -a Terminal notebook_thread.sh'
-    return thread_darwin
-
-
-def get_system_info(platform, line):
-    system_info = { 'terminal': '', 'shell': '' }
-    if platform == 'Windows':
-        system_info['shell'] = 'cmd'
-        system_info['terminal'] = 'start cmd /c ' + line
-    elif platform == 'Linux':
-        system_info['shell'] = 'bash'
-        system_info['terminal'] = 'gnome-terminal -- ' + line
-    elif platform == 'Darwin':
-        system_info['shell'] = 'bash'
-        # Store in tmp folder
-        system_info['terminal'] = 'printf \"#!/bin/bash\\n' \
-                                  'function finish {\\n' \
-                                  'rm notebook_thread.sh;\\n' \
-                                  '}\\n' \
-                                  'cd ' + os.getcwd() + '\\n' + line + '\\n' \
-                                  'trap finish EXIT\" > notebook_thread.sh' \
-                                  ' && chmod +x notebook_thread.sh && open -a Terminal notebook_thread.sh'
-        'printf \"{{{shell}}}\" > notebook_thread.sh' \
-                                  ' && chmod +x notebook_thread.sh' \
-                                  ' && open -a Terminal notebook_thread.sh'
-    return system_info
-
-@magics_class
-class CustomMagics(Magics):
-
-    # Modified %lsmagic to show up in vscode's notebook extension
-    @line_magic
-    def listmagic(self, line):
-        line = line.strip()
-        magics = str(get_ipython().run_line_magic('lsmagic', '',  _stack_depth=2))
-        magics = magics.replace('\n', ' ')
-        return magics
-
-    # Helper function to also be able to replace variables when writing files
-    @cell_magic
-    def writetemplate(self, line, cell):
-        "Writes file while inserting environment variables given as {var}"
-        replaced = []
-        filepath = line.strip('"')
-        with open(filepath, 'w', encoding='utf8') as f:
-            for k, v in sorted(os.environ.items()):
-                template = '{' + k + '}'
-                if '{' not in v:
-                    template_value = '"' + v + '"'
-                else:
-                    template_value = v
-                if template in cell:
-                    cell = cell.replace(template, template_value)
-                    replaced.append('{' + k + '}=' + template_value)
-            f.write(cell)
-        return 'Replaced ' + ', '.join(replaced) + '. Writing ' + line + '.'
-
-get_ipython().register_magics(CustomMagics)
-
-def new_thread_window(line):
-    "Runs cds with native CLI, with function 'cds watch' being executed as a separate thread in new a terminal window."
-    line = line.strip()
-    system_info = get_system_info(platform.system(), line)
-    cell_magic = system_info['terminal']
-    # Starts a separate thread such that cmd does not block the notebook
-    if cell_magic:
-        def do_magic():
-            get_ipython().run_cell_magic(system_info['shell'], '', cell_magic)
-        Thread(target=do_magic).start()
-        return 'Running ' + line + '...'
-    else:
-        return 'Please open a new terminal outside of the notebook and run: ' + line + '...'
-
-def filter(*args):
-    cmd = ' '.join(list(args))
-    if cmd.lower().startswith(tuple(list_thread_cmds)):
-        new_thread_window(cmd)
-        print(cmd + ' started in new terminal window')
-    else:
-        cmd = ' '.join(list(args))
-        try:
-            output = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT)
-            for line in output.splitlines():
-                print(line.decode('utf-8'))
-        except subprocess.CalledProcessError as e:
-            for line in e.output.splitlines():
-                if line.startswith(b'[ERROR]'):
-                    print('\n')
-                print(line.decode('utf-8'))
-    return
-
-get_ipython().system = filter
-
-print('CAP magic loaded successfully - Have fun with your notebook!')

package/lib/init/template/notebook/files/{{{name}}}.ipynb.hbs

@@ -1,90 +0,0 @@
-{
-  "metadata": {
-    "cap_nb_version": "1.0.0",
-    "cap_magic": "",
-    "language_info": {
-      "codemirror_mode": {
-        "name": "ipython",
-        "version": 3
-      },
-      "file_extension": ".py",
-      "mimetype": "text/x-python",
-      "name": "python",
-      "nbconvert_exporter": "python",
-      "pygments_lexer": "ipython3",
-      "version": 3
-    },
-    "orig_nbformat": 2,
-    "kernelspec": {
-      "name": ".cap-jupyter-nb",
-      "display_name": ".cap-jupyter-nb"
-    }
-  },
-  "nbformat": 4,
-  "nbformat_minor": 2,
-  "cells": [
-    {
-      "cell_type": "markdown",
-      "metadata": {},
-      "source": [
-                "<h1>Welcome to CAP Notebooks!&emsp;<img style=\"vertical-align:middle\" src=\"{{{cap}}}/docs/assets/logos/sap.svg\" alt=\"drawing\" width=\"70\"/><img style=\"vertical-align:middle\" src=\"{{{cap}}}/docs/assets/logos/cap.svg\" alt=\"drawing\" width=\"60\"/></h1>\n",
-                "\n",
-                "## What is a CAP Notebook?\n",
-                "\n",
-                "A CAP notebook is a [Jupyter Notebook](https://jupyter.org/) that serves as a guide on how to create, navigate and monitor CAP projects.\n",
-                "\n",
-                "With this, we want to encourage the CAP community to work with CAP in the same *explorative* manner that data scientists work with their data by:\n",
-                "\n",
-                "- Visually interacting with their code\n",
-                "- Playing with REPL-type inputs (notebook input cells)\n",
-                "- Storing persistent code (notebook output cells)\n",
-                "\n",
-                "The cell inputs/outputs are especially useful at later points in time when the project's details have long been forgotten. In addition, notebooks are a good way to share, compare and also reproduce projects.\n",
-                "<br><br>\n",
-                "\n",
-                "## How do I run the CAP Notebook?\n",
-                "\n",
-                "The following symbols indicate the state of a cell:\n",
-                "\n",
-                "&emsp;&emsp;&emsp;  `▶` : Executes the cell\n",
-                "\n",
-                "&emsp;&emsp;&emsp;  `*`   : Indicates that the cell is *running*\n",
-                "  \n",
-                "&emsp;&emsp;&emsp;  `■`   : Stops cell execution\n",
-                "\n",
-                "When finished running, you will see the cell's output appear below the code cell. The blue bar on the left moves to keep track of where you are in the notebook. You can use `+` to add new cells anywhere in the notebook. See [Guide](https://code.visualstudio.com/docs/python/jupyter-support#_create-or-open-a-jupyter-notebook) for a more detailed description.\n",
-                "<br><br>\n",
-                "\n",
-                "## How do I interact with the CAP Notebook?\n",
-                "\n",
-                "In notebooks, predefined [Magic commands](https://ipython.readthedocs.io/en/stable/interactive/magics.html) have been designed to succinctly solve various common problems. They all start with `%` or `%%` for line or cell magic commands.\n",
-                "\n",
-                "&emsp;&emsp;&emsp; `%quickref`  : Provides a full list of magic functions available\n",
-                "\n",
-                "You will find these being used throughout the notebook.\n",
-                "<br><br>\n",
-                "\n",
-                "## How do I get started?\n",
-                "\n",
-                "Start by executing the first cell, which registers some additional magic commands which make our notebook platform-independent (across Windows, Linux and Mac).\n",
-                "\n",
-                "After that, you're ready to start the CAP [Getting started in a Nutshell](https://cap.cloud.sap/docs/get-started/in-a-nutshell) tutorial. \n",
-                "\n",
-                "**```🡇 NOTE: This cell must be included and run at the start of any CAP Notebook! 🡇```**"
-            ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "tags": []
-      },
-      "outputs": [],
-      "source": [
-        "import glob, json\n",
-        "with open(glob.glob('./*.ipynb')[0], encoding='utf8') as json_file:\n",
-        "    exec(json.load(json_file)['metadata']['cap_magic'])"
-      ]
-    }
-  ]
-}

package/lib/init/template/notebook/files/{{{name}}}.json

@@ -1,102 +0,0 @@
-{
-"metadata": {
-"cap_nb_version": "1.0.0",
-"cap_magic": "",
-"language_info": {
-"codemirror_mode": {
-"name": "ipython",
-"version": 3
-},
-"file_extension": ".py",
-"mimetype": "text/x-python",
-"name": "python",
-"nbconvert_exporter": "python",
-"pygments_lexer": "ipython3",
-"version": 3
-},
-"orig_nbformat": 2,
-"kernelspec": {
-"name": "nbvenv",
-"display_name": "nbvenv"
-}
-},
-"nbformat": 4,
-"nbformat_minor": 2,
-"cells": [
-{
-"cell_type": "markdown",
-"metadata": {},
-"source": [
-"<h1>Welcome to CAP Notebooks!&emsp;<img style=\"vertical-align:middle\" src=\"{{{cap}}}/docs/assets/logos/sap.svg\"
-    alt=\"drawing\" width=\"70\" /><img style=\"vertical-align:middle\" src=\"{{{cap}}}/docs/assets/logos/cap.svg\"
-    alt=\"drawing\" width=\"60\" /></h1>\n",
-"\n",
-"## What is a CAP Notebook?\n",
-"\n",
-"A CAP notebook is a [Jupyter Notebook](https://jupyter.org/) that serves as a guide on how to create, navigate and
-monitor CAP projects.\n",
-"\n",
-"With this, we want to encourage the CAP community to work with CAP in the same *explorative* manner that data
-scientists work with their data by:\n",
-"\n",
-"- Visually interacting with their code\n",
-"- Playing with REPL-type inputs (notebook input cells)\n",
-"- Storing persistent code (notebook output cells)\n",
-"\n",
-"The cell inputs/outputs are especially useful at later points in time when the project's details have long been
-forgotten. In addition, notebooks are a good way to share, compare and also reproduce projects.\n",
-"<br><br>\n",
-"\n",
-"## How do I run the CAP Notebook?\n",
-"\n",
-"The following symbols indicate the state of a cell:\n",
-"\n",
-"&emsp;&emsp;&emsp; `▶` : Executes the cell\n",
-"\n",
-"&emsp;&emsp;&emsp; `*` : Indicates that the cell is *running*\n",
-" \n",
-"&emsp;&emsp;&emsp; `■` : Stops cell execution\n",
-"\n",
-"When finished running, you will see the cell's output appear below the code cell. The blue bar on the left moves to
-keep track of where you are in the notebook. You can use `+` to add new cells anywhere in the notebook. See
-[Guide](https://code.visualstudio.com/docs/python/jupyter-support#_create-or-open-a-jupyter-notebook) for a more
-detailed description.\n",
-"<br><br>\n",
-"\n",
-"## How do I interact with the CAP Notebook?\n",
-"\n",
-"In notebooks, predefined [Magic commands](https://ipython.readthedocs.io/en/stable/interactive/magics.html) have been
-designed to succinctly solve various common problems. They all start with `%` or `%%` for line or cell magic
-commands.\n",
-"\n",
-"&emsp;&emsp;&emsp; `%quickref` : Provides a full list of magic functions available\n",
-"\n",
-"You will find these being used throughout the notebook.\n",
-"<br><br>\n",
-"\n",
-"## How do I get started?\n",
-"\n",
-"Start by executing the first cell, which registers some additional magic commands which make our notebook
-platform-independent (across Windows, Linux and Mac).\n",
-"\n",
-"After that, you're ready to start the CAP [Getting started in a
-Nutshell](https://cap.cloud.sap/docs/get-started/in-a-nutshell) tutorial. \n",
-"\n",
-"**```🡇 NOTE: This cell must be included and run at the start of any CAP Notebook! 🡇```**"
-]
-},
-{
-"cell_type": "code",
-"execution_count": null,
-"metadata": {
-"tags": []
-},
-"outputs": [],
-"source": [
-"import glob, json\n",
-"with open(glob.glob('./*.ipynb')[0], encoding='utf8') as json_file:\n",
-" exec(json.load(json_file)['metadata']['cap_magic'])"
-]
-}
-]
-}