Updates to support Edge CLI

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"
 )

Minimal/app_config.json

@@ -8,6 +8,6 @@
   "cmd_deps": [
     "docker"
   ],
-  "app_id": null,
-  "framework": null
+  "framework": "generic",
+  "app_id": null
 }

Minimal/bootstrap.py

@@ -15,10 +15,12 @@
 import subprocess
 import json
 
-with open("config.json", "r") as f:
+
+with open("app_config.json", "r") as f:
     config = json.load(f)
-ENV_NAME = config["ENV_NAME"]
-EDM_DEPS = config["EDM_DEPS"]
+ENV_NAME = config["env_name"]
+EDM_DEPS = config["cmd_deps"]
+
 
 def bootstrap(ci_mode):
     """Create and populate dev env.

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"
 )

Panel/app_config.json

@@ -0,0 +1,13 @@
+{
+  "env_name": "edge-panel-example",
+  "edm_deps": [
+    "click",
+    "pip",
+    "setuptools"
+  ],
+  "cmd_deps": [
+    "docker"
+  ],
+  "framework": "panel",
+  "app_id": null
+}

Panel/bootstrap.py

@@ -13,9 +13,13 @@
 
 import argparse
 import subprocess
+import json
 
-ENV_NAME = "edge-panel-example"
-EDM_DEPS = ["click", "pip", "setuptools"]
+
+with open("app_config.json", "r") as f:
+    config = json.load(f)
+ENV_NAME = config["env_name"]
+EDM_DEPS = config["cmd_deps"]
 
 
 def bootstrap(ci_mode):
@@ -35,7 +39,7 @@ 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 environment '{ENV_NAME}'")

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"
 )

Plotly Dash/app_config.json

@@ -0,0 +1,13 @@
+{
+  "env_name": "edge-plotly-dash-example",
+  "edm_deps": [
+    "click",
+    "pip",
+    "setuptools"
+  ],
+  "cmd_deps": [
+    "docker"
+  ],
+  "framework": "plotly-dash",
+  "app_id": null
+}

Plotly Dash/bootstrap.py

@@ -13,9 +13,13 @@
 
 import argparse
 import subprocess
+import json
 
-ENV_NAME = "edge-plotly-dash-example"
-EDM_DEPS = ["click", "pip", "setuptools"]
+
+with open("app_config.json", "r") as f:
+    config = json.load(f)
+ENV_NAME = config["env_name"]
+EDM_DEPS = config["cmd_deps"]
 
 
 def bootstrap(ci_mode):
@@ -35,7 +39,7 @@ 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 environment '{ENV_NAME}'")

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"
 )

React/app_config.json

@@ -0,0 +1,14 @@
+{
+  "env_name": "edge-react-example",
+  "edm_deps": [
+    "click",
+    "gunicorn",,
+    "pip",
+    "setuptools"
+  ],
+  "cmd_deps": [
+    "docker"
+  ],
+  "framework": "react",
+  "app_id": null
+}

React/bootstrap.py

@@ -13,9 +13,13 @@
 
 import argparse
 import subprocess
+import json
 
-ENV_NAME = "edge-react-example"
-EDM_DEPS = ["click", "gunicorn", "pip", "setuptools"]
+
+with open("app_config.json", "r") as f:
+    config = json.load(f)
+ENV_NAME = config["env_name"]
+EDM_DEPS = config["cmd_deps"]
 
 
 def bootstrap(ci_mode):
@@ -35,7 +39,7 @@ 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 environment '{ENV_NAME}'")

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"
 )

Streamlit/app_config.json

@@ -0,0 +1,13 @@
+{
+  "env_name": "edge-streamlit-example",
+  "edm_deps": [
+    "click",
+    "pip",
+    "setuptools"
+  ],
+  "cmd_deps": [
+    "docker"
+  ],
+  "framework": "streamlit",
+  "app_id": null
+}

Streamlit/bootstrap.py

@@ -13,9 +13,13 @@
 
 import argparse
 import subprocess
+import json
 
-ENV_NAME = "edge-streamlit-example"
-EDM_DEPS = ["click", "pip", "setuptools"]
+
+with open("app_config.json", "r") as f:
+    config = json.load(f)
+ENV_NAME = config["env_name"]
+EDM_DEPS = config["cmd_deps"]
 
 
 def bootstrap(ci_mode):
@@ -35,7 +39,7 @@ 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 environment '{ENV_NAME}'")