Bump version + CLI updates (#29)

* cli: whoami * bump: version * bump: version * bump: version * bump: version * chore: update cloud api * chore: sharedpackage * fix: pyodide * bump: version * docs * bump: version
datalayer · Nov 26, 2024 · 2e7ee3a · 2e7ee3a
1 parent 3c88eb8
commit 2e7ee3a
Show file tree

Hide file tree

Showing 17 changed files with 38 additions and 31 deletions.
diff --git a/datalayer_core/about/about.md b/datalayer_core/about/about.md
@@ -3,4 +3,4 @@
 Datalayer provides a command line tool allowing to list, create, terminate and open a console against
 a remote kernel.
 
-Read more on https://docs.datalayer.run
+Read more on https://docs.datalayer.io
diff --git a/datalayer_core/authn/__main__.py b/datalayer_core/authn/__main__.py
@@ -13,7 +13,7 @@
 logger = logging.getLogger(__name__)
 
 
-DATALAYER_RUN_URL = "https://oss.datalayer.run"
+DATALAYER_RUN_URL = "https://prod1.datalayer.run"
 
 
 if __name__ == "__main__":

diff --git a/datalayer_core/authn/apps/utils.py b/datalayer_core/authn/apps/utils.py
@@ -4,18 +4,20 @@
 from rich.console import Console
 from rich.table import Table
 
-def display_me(me: dict) -> None:
+def display_me(me: dict, infos: dict) -> None:
     """Display a my profile."""
     table = Table(title="Profile")
     table.add_column("ID", style="magenta", no_wrap=True)
     table.add_column("Handle", style="cyan", no_wrap=True)
     table.add_column("First name", style="green", no_wrap=True)
     table.add_column("Last name", style="green", no_wrap=True)
+    table.add_column("RUN URL", style="green", no_wrap=True)
     table.add_row(
         me["uid"],
         me["handle_s"],
         me["first_name_t"],
         me["last_name_t"],
+        infos.get("run_url")
     )
     console = Console()
     console.print(table)
diff --git a/datalayer_core/authn/apps/whoamiapp.py b/datalayer_core/authn/apps/whoamiapp.py
@@ -27,4 +27,7 @@ def start(self):
             "{}/api/iam/v1/whoami".format(self.run_url),
         )
         raw = response.json()
-        display_me(raw.get("profile", {}))
+        infos =  {
+            "run_url": self.run_url,
+        }
+        display_me(raw.get("profile", {}), infos)
diff --git a/datalayer_core/cli/base.py b/datalayer_core/cli/base.py
@@ -61,7 +61,7 @@ class DatalayerCLIBaseApp(DatalayerApp):
         help="Datalayer RUN URL."
     )
     def _run_url_default(self):
-        return os.environ.get("DATALAYER_RUN_URL", "https://oss.datalayer.run")
+        return os.environ.get("DATALAYER_RUN_URL", "https://prod1.datalayer.run")
 
     token = Unicode(
         None,

diff --git a/datalayer_core/cli/datalayer.py b/datalayer_core/cli/datalayer.py
@@ -7,12 +7,13 @@
 
 from datalayer_core.cli.base import DatalayerCLIBaseApp
 
+from datalayer_core.about.aboutapp import DatalayerAboutApp
 from datalayer_core.authn.apps.loginapp import DatalayerLoginApp
 from datalayer_core.authn.apps.logoutapp import DatalayerLogoutApp
 from datalayer_core.authn.apps.whoamiapp import WhoamiApp
 from datalayer_core.benchmarks.benchmarksapp import BenchmarksApp
-from datalayer_core.about.aboutapp import DatalayerAboutApp
 from datalayer_core.environments.environmentsapp import EnvironmentsApp
+from datalayer_core.kernels.console.consoleapp import KernelsConsoleApp
 from datalayer_core.kernels.kernelsapp import JupyterKernelsApp
 from datalayer_core.web.webapp import DatalayerWebApp
 
@@ -32,6 +33,7 @@ class DatalayerCLI(DatalayerCLIBaseApp):
     subcommands = {
         "about": (DatalayerAboutApp, DatalayerAboutApp.description.splitlines()[0]),
         "benchmarks": (BenchmarksApp, BenchmarksApp.description.splitlines()[0]),
+        "console": (KernelsConsoleApp, KernelsConsoleApp.description.splitlines()[0]),
         "envs": (EnvironmentsApp, EnvironmentsApp.description.splitlines()[0]),
         "kernels": (JupyterKernelsApp, JupyterKernelsApp.description.splitlines()[0]),
         "login": (DatalayerLoginApp, DatalayerLoginApp.description.splitlines()[0]),

diff --git a/datalayer_core/environments/environmentsapp.py b/datalayer_core/environments/environmentsapp.py
@@ -17,6 +17,7 @@ class EnvironmentsApp(DatalayerCLIBaseApp):
 
     subcommands = {
         "list": (EnvironmentsListApp, EnvironmentsListApp.description.splitlines()[0]),
+        "ls": (EnvironmentsListApp, EnvironmentsListApp.description.splitlines()[0]),
     }
 
     def start(self):

diff --git a/datalayer_core/environments/list/listapp.py b/datalayer_core/environments/list/listapp.py
@@ -53,12 +53,15 @@ def start(self):
         )
         content = response.json()
         table = new_env_table()
-        for environment in content.get("environments", []):
+        environments = content.get("environments", [])
+        for environment in environments:
             add_env_to_table(table, environment)
         console = Console()
         console.print(table)
-        print("""
+        if (len(environments) > 0):
+            print(f"""
 Create a kernel with e.g.
-              
-datalayer kernels create --given-name my-kernel --credits-limit 3 python-simple-env
-""")
+    """)
+        for environment in environments:
+            print(f"datalayer kernels create --given-name my-kernel --credits-limit 3 {environment['name']}")
+        print()
diff --git a/datalayer_core/kernels/console/shell.py b/datalayer_core/kernels/console/shell.py
@@ -23,7 +23,7 @@ class WSTerminalInteractiveShell(ZMQTerminalInteractiveShell):
     @default("banner")
     def _default_banner(self):
         # FIXME
-        return "JupyterKernels console {version}\n\n{kernel_banner}"
+        return "Datalayer - Jupyter Kernel console {version}\n\n{kernel_banner}"
 
     async def handle_external_iopub(self, loop=None):
         while self.keep_running:

diff --git a/datalayer_core/kernels/create/createapp.py b/datalayer_core/kernels/create/createapp.py
@@ -66,7 +66,7 @@ def start(self):
             available -= sum(map(lambda r: r["credits"], reservations))
             self.credits_limit = max(0., available * 0.5)
             self.log.warning(
-                "The kernel will be allowed to consumed half of your remaining credits; i.e. {:.2f}.".format(
+                "The kernel will be allowed to consumed half of your remaining credits: {:.2f} credit.".format(
                     self.credits_limit
                 )
             )
@@ -75,11 +75,10 @@ def start(self):
             self.log.warning("Credits reservation is not positive. Exiting…")
             self.exit(1)
         body["credits_limit"] = self.credits_limit
+        body["environment_name"] = environment_name
 
         response = self._fetch(
-            "{}/api/jupyter/v1/environment/{}".format(
-                self.run_url, environment_name
-            ),
+            "{}/api/jupyter/v1/kernels".format(self.run_url),
             method="POST",
             json=body,
         )

diff --git a/datalayer_core/kernels/kernelsapp.py b/datalayer_core/kernels/kernelsapp.py
@@ -30,6 +30,7 @@ class JupyterKernelsApp(DatalayerCLIBaseApp):
         "create": (KernelsCreateApp, KernelsCreateApp.description.splitlines()[0]),
         "exec": (KernelsExecApp, KernelsExecApp.description.splitlines()[0]),
         "list": (KernelsListApp, KernelsListApp.description.splitlines()[0]),
+        "ls": (KernelsListApp, KernelsListApp.description.splitlines()[0]),
         "pause": (KernelsPauseApp, KernelsPauseApp.description.splitlines()[0]),
         "start": (KernelsStartApp, KernelsStartApp.description.splitlines()[0]),
         "stop": (KernelsStopApp, KernelsStopApp.description.splitlines()[0]),

diff --git a/datalayer_core/kernels/list/listapp.py b/datalayer_core/kernels/list/listapp.py
@@ -28,8 +28,3 @@ def start(self):
         )
         raw = response.json()
         display_kernels(raw.get("kernels", []))
-        print("""
-Create a kernel with e.g.
-              
-datalayer kernels create --given-name my-kernel --credits-limit 3 python-simple-env
-""")
diff --git a/datalayer_core/kernels/manager.py b/datalayer_core/kernels/manager.py
@@ -116,7 +116,7 @@ def start_kernel(self, **kwargs):
         kernel = None
         if kernel_name:
             response = fetch(
-                "{}/api/jupyter/v1/kernel/{}".format(self.run_url, kernel_name),
+                "{}/api/jupyter/v1/kernels/{}".format(self.run_url, kernel_name),
                 token=self.token,
             )
             kernel = response.json().get("kernel")

diff --git a/datalayer_core/kernels/terminate/terminateapp.py b/datalayer_core/kernels/terminate/terminateapp.py
@@ -25,7 +25,7 @@ def start(self):
         kernel_id = self.extra_args[0]
 
         self._fetch(
-            "{}/api/jupyter/v1/kernel/{}".format(self.run_url, kernel_id),
+            "{}/api/jupyter/v1/kernels/{}".format(self.run_url, kernel_id),
             method="DELETE",
         )
         self.log.info(f"Kernel '{kernel_id}' deleted.")
diff --git a/datalayer_core/serverapplication.py b/datalayer_core/serverapplication.py
@@ -40,7 +40,7 @@ class DatalayerExtensionApp(ExtensionAppJinjaMixin, ExtensionApp):
     # In that case, the consumer of those settings are free
     # to consider run_url as null.
     run_url = Unicode(
-        "https://oss.datalayer.run",
+        "https://prod1.datalayer.run",
         config=True,
         allow_none=True,
         help="""URL to connect to the Datalayer RUN APIs.""",

diff --git a/package.json b/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@datalayer/core",
-  "version": "1.0.12",
+  "version": "1.0.23",
   "description": "Ξ Datalayer Core.",
   "keywords": [
     "datalayer",
     "jupyter",
     "jupyterlab",
     "jupyterlab-extension"
   ],
-  "homepage": "https://github.com/datalayer/datalayer",
+  "homepage": "https://github.com/datalayer/core",
   "bugs": {
     "url": "https://github.com/datalayer/datalayer/issues"
   },
@@ -27,7 +27,7 @@
   "style": "style/index.css",
   "repository": {
     "type": "git",
-    "url": "https://github.com/datalayer/datalayer.git"
+    "url": "https://github.com/datalayer/datalayer_core.git"
   },
   "scripts": {
     "build": "jlpm build:lib && jlpm build:labextension:dev",
@@ -65,7 +65,7 @@
     "watch:src": "tsc -w"
   },
   "dependencies": {
-    "@datalayer/ui": "^0.2.8"
+    "@datalayer/ui": "^0.3.9"
   },
   "devDependencies": {
     "@babel/core": "^7.21.0",
@@ -179,6 +179,7 @@
     "@lumino/signaling": "2.1.1",
     "@lumino/virtualdom": "2.0.1",
     "@lumino/widgets": "2.3.1",
+    "@lezer/python": "1.1.13",
     "@primer/react": "^36.25.0",
     "@rjsf/core": "5.3.0",
     "@rjsf/utils": "5.3.0",
@@ -266,7 +267,7 @@
         "singleton": true
       },
       "@jupyterlite/pyodide-kernel": {
-        "bundled": false,
+        "bundled": true,
         "singleton": true
       },
       "@jupyterlite/server": {

diff --git a/src/DatalayerApp.tsx b/src/DatalayerApp.tsx
@@ -10,7 +10,7 @@
 import { useState, useEffect } from 'react';
 import { createRoot } from 'react-dom/client';
 import { MemoryRouter } from 'react-router-dom';
-import { RunIndex, LoginFormCLI, BenchmarksExample, KernelsExample } from '@datalayer/ui';
+import { IOIndex, LoginFormCLI, BenchmarksExample, KernelsExample } from '@datalayer/ui';
 
 import '../style/index.css';
 
@@ -48,7 +48,7 @@ export const DatalayerApp = (): JSX.Element => {
         <></>
       )}
       { view === 'web' && (
-        <RunIndex />
+        <IOIndex />
       )}
       { view === 'kernels' && (
         <KernelsExample memoryRouter={true} baseRoute="datalayer" />