Additions for Edge CLI support (#85)

enthought · Jun 19, 2024 · 4457550 · 4457550
1 parent 696128c
commit 4457550
Show file tree

Hide file tree

Showing 15 changed files with 71 additions and 20 deletions.
diff --git a/Minimal/README.md b/Minimal/README.md
@@ -185,7 +185,7 @@ version = AppVersion(
     description="This Is An Example Edge Application",
     icon=ICON,
     kind=AppKindEnum.Native,
-    proxy_kind=AppProxyKindEnum.Generic,
+    framework=AppProxyKindEnum.Generic,
     link="quay.io/<YOUR_ORGANIZATION>/YOUR_IMAGE_NAME_HERE:TAG",
     recommended_profile="edge.medium"
 )

diff --git a/Minimal/app_config.yaml b/Minimal/app_config.yaml
@@ -0,0 +1,9 @@
+env_name: edge-minimal-example
+edm_deps:
+- click
+- pip
+- setuptools
+cmd_deps:
+- docker
+framework: generic
+app_id: null
diff --git a/Minimal/bootstrap.py b/Minimal/bootstrap.py
@@ -14,6 +14,7 @@
 import argparse
 import subprocess
 
+
 ENV_NAME = "edge-minimal-example"
 EDM_DEPS = ["click", "pip", "setuptools"]
 
@@ -25,7 +26,7 @@ def bootstrap(ci_mode):
     """
 
     if ENV_NAME not in _list_edm_envs():
-        print(f"Creating development environment {ENV_NAME}...")
+        print(f"Creating development environment '{ENV_NAME}'...")
         cmd = ["edm", "envs", "create", ENV_NAME, "--version", "3.8", "--force"]
         subprocess.run(cmd, check=True)
 
@@ -35,10 +36,10 @@ def bootstrap(ci_mode):
         print("Bootstrap complete.")
 
     else:
-        print("Environment already exists; reusing.")
+        print(f"Environment '{ENV_NAME}' already exists; reusing.")
 
     if not ci_mode:
-        print(f"Activating dev environment {ENV_NAME}")
+        print(f"Activating environment '{ENV_NAME}'")
         subprocess.run(["edm", "shell", "-e", ENV_NAME])
 
 

diff --git a/Panel/README.md b/Panel/README.md
@@ -166,7 +166,7 @@ version = AppVersion(
     description="This Is An Example Edge Application",
     icon=ICON,
     kind=AppKindEnum.Native,
-    proxy_kind=AppProxyKindEnum.Panel,
+    framework=AppProxyKindEnum.Panel,
     link="quay.io/<YOUR_ORGANIZATION>/YOUR_IMAGE_NAME_HERE:TAG",
     recommended_profile="edge.medium"
 )

diff --git a/Panel/app_config.yaml b/Panel/app_config.yaml
@@ -0,0 +1,9 @@
+env_name: edge-panel-example
+edm_deps:
+- click
+- pip
+- setuptools
+cmd_deps:
+- docker
+framework: panel
+app_id: null
diff --git a/Panel/bootstrap.py b/Panel/bootstrap.py
@@ -14,6 +14,7 @@
 import argparse
 import subprocess
 
+
 ENV_NAME = "edge-panel-example"
 EDM_DEPS = ["click", "pip", "setuptools"]
 
@@ -25,7 +26,7 @@ def bootstrap(ci_mode):
     """
 
     if ENV_NAME not in _list_edm_envs():
-        print(f"Creating development environment {ENV_NAME}...")
+        print(f"Creating development environment '{ENV_NAME}'...")
         cmd = ["edm", "envs", "create", ENV_NAME, "--version", "3.8", "--force"]
         subprocess.run(cmd, check=True)
 
@@ -35,10 +36,10 @@ def bootstrap(ci_mode):
         print("Bootstrap complete.")
 
     else:
-        print("Environment already exists; reusing.")
+        print(f"Environment '{ENV_NAME}' already exists; reusing.")
 
     if not ci_mode:
-        print(f"Activating dev environment {ENV_NAME}")
+        print(f"Activating environment '{ENV_NAME}'")
         subprocess.run(["edm", "shell", "-e", ENV_NAME])
 
 

diff --git a/Plotly Dash/README.md b/Plotly Dash/README.md
@@ -166,7 +166,7 @@ version = AppVersion(
     description="This Is An Example Edge Application",
     icon=ICON,
     kind=AppKindEnum.Native,
-    proxy_kind=AppProxyKindEnum.PlotlyDash,
+    framework=AppProxyKindEnum.PlotlyDash,
     link="quay.io/<YOUR_ORGANIZATION>/YOUR_IMAGE_NAME_HERE:TAG",
     recommended_profile="edge.medium"
 )

diff --git a/Plotly Dash/app_config.yaml b/Plotly Dash/app_config.yaml
@@ -0,0 +1,9 @@
+env_name: edge-plotly-dash-example
+edm_deps:
+- click
+- pip
+- setuptools
+cmd_deps:
+- docker
+framework: plotly-dash
+app_id: null
diff --git a/Plotly Dash/bootstrap.py b/Plotly Dash/bootstrap.py
@@ -14,6 +14,7 @@
 import argparse
 import subprocess
 
+
 ENV_NAME = "edge-plotly-dash-example"
 EDM_DEPS = ["click", "pip", "setuptools"]
 
@@ -25,7 +26,7 @@ def bootstrap(ci_mode):
     """
 
     if ENV_NAME not in _list_edm_envs():
-        print(f"Creating development environment {ENV_NAME}...")
+        print(f"Creating development environment '{ENV_NAME}'...")
         cmd = ["edm", "envs", "create", ENV_NAME, "--version", "3.8", "--force"]
         subprocess.run(cmd, check=True)
 
@@ -35,10 +36,10 @@ def bootstrap(ci_mode):
         print("Bootstrap complete.")
 
     else:
-        print("Environment already exists; reusing.")
+        print(f"Environment '{ENV_NAME}' already exists; reusing.")
 
     if not ci_mode:
-        print(f"Activating dev environment {ENV_NAME}")
+        print(f"Activating environment '{ENV_NAME}'")
         subprocess.run(["edm", "shell", "-e", ENV_NAME])
 
 

diff --git a/React/README.md b/React/README.md
@@ -210,7 +210,7 @@ version = AppVersion(
     description="This Is An Example Edge Application",
     icon=ICON,
     kind=AppKindEnum.Native,
-    proxy_kind=AppProxyKindEnum.React,
+    framework=AppProxyKindEnum.React,
     link="quay.io/<YOUR_ORGANIZATION>/YOUR_IMAGE_NAME_HERE:TAG",
     recommended_profile="edge.medium"
 )

diff --git a/React/app_config.yaml b/React/app_config.yaml
@@ -0,0 +1,10 @@
+env_name: edge-react-example
+edm_deps:
+- click
+- gunicorn
+- pip
+- setuptools
+cmd_deps:
+- docker
+framework: react
+app_id: null
diff --git a/React/bootstrap.py b/React/bootstrap.py
@@ -14,6 +14,7 @@
 import argparse
 import subprocess
 
+
 ENV_NAME = "edge-react-example"
 EDM_DEPS = ["click", "gunicorn", "pip", "setuptools"]
 
@@ -25,7 +26,7 @@ def bootstrap(ci_mode):
     """
 
     if ENV_NAME not in _list_edm_envs():
-        print(f"Creating development environment {ENV_NAME}...")
+        print(f"Creating development environment '{ENV_NAME}'...")
         cmd = ["edm", "envs", "create", ENV_NAME, "--version", "3.8", "--force"]
         subprocess.run(cmd, check=True)
 
@@ -35,10 +36,10 @@ def bootstrap(ci_mode):
         print("Bootstrap complete.")
 
     else:
-        print("Environment already exists; reusing.")
+        print(f"Environment '{ENV_NAME}' already exists; reusing.")
 
     if not ci_mode:
-        print(f"Activating dev environment {ENV_NAME}")
+        print(f"Activating environment '{ENV_NAME}'")
         subprocess.run(["edm", "shell", "-e", ENV_NAME])
 
 

diff --git a/Streamlit/README.md b/Streamlit/README.md
@@ -167,7 +167,7 @@ version = AppVersion(
     description="This Is An Example Edge Application",
     icon=ICON,
     kind=AppKindEnum.Native,
-    proxy_kind=AppProxyKindEnum.Streamlit,
+    framework=AppProxyKindEnum.Streamlit,
     link="quay.io/<YOUR_ORGANIZATION>/YOUR_IMAGE_NAME_HERE:TAG",
     recommended_profile="edge.medium"
 )

diff --git a/Streamlit/app_config.yaml b/Streamlit/app_config.yaml
@@ -0,0 +1,9 @@
+env_name: edge-streamlit-example
+edm_deps:
+- click
+- pip
+- setuptools
+cmd_deps:
+- docker
+framework: streamlit
+app_id: null
diff --git a/Streamlit/bootstrap.py b/Streamlit/bootstrap.py
@@ -14,6 +14,7 @@
 import argparse
 import subprocess
 
+
 ENV_NAME = "edge-streamlit-example"
 EDM_DEPS = ["click", "pip", "setuptools"]
 
@@ -25,7 +26,7 @@ def bootstrap(ci_mode):
     """
 
     if ENV_NAME not in _list_edm_envs():
-        print(f"Creating development environment {ENV_NAME}...")
+        print(f"Creating development environment '{ENV_NAME}'...")
         cmd = ["edm", "envs", "create", ENV_NAME, "--version", "3.8", "--force"]
         subprocess.run(cmd, check=True)
 
@@ -35,10 +36,10 @@ def bootstrap(ci_mode):
         print("Bootstrap complete.")
 
     else:
-        print("Environment already exists; reusing.")
+        print(f"Environment '{ENV_NAME}' already exists; reusing.")
 
     if not ci_mode:
-        print(f"Activating dev environment {ENV_NAME}")
+        print(f"Activating environment '{ENV_NAME}'")
         subprocess.run(["edm", "shell", "-e", ENV_NAME])