rename main

README.md

@@ -5,7 +5,7 @@ colorFrom: indigo
 colorTo: blue
 sdk: gradio
 sdk_version: 4.39.0
-app_file: app.py
+app_file: svg_editor_gradio.py
 pinned: false
 ---
 

env_utils.py

@@ -0,0 +1,18 @@
+from dotenv import load_dotenv, find_dotenv
+import os
+
+def getenvvar(varname):
+    # needed to strip env var of any remaining quotes - might be added by deployment scripts
+    val = os.environ.get(varname)
+    if val is None:
+        f"Environment variable {varname} not found"
+    else:
+        return val.strip('"').strip("'")
+
+def load_credentials():
+    load_dotenv(find_dotenv())  # take environment variables from .env.
+    apikey = getenvvar("WXAI_APIKEY")
+    apiendpoint = getenvvar("WXAI_ENDPOINT")
+    projectid = getenvvar("WXAI_PROJECT")
+    status = apiendpoint is not None and apikey is not None and projectid is not None
+    return status, apiendpoint, apikey, projectid

requirements.txt

@@ -1,2 +1,2 @@
 gradio
-ibm_watsonx_ai
+ibm_watsonx_ai==1.1.2

app.py → svg_editor_gradio.py

@@ -1,5 +1,5 @@
 # Remi Serra 202407
-
+from env_utils import load_credentials
 import gradio as gr
 from random import randrange
 from svg_utils import decode_b64_string_to_pretty_xml, encode_svg_xml_to_b64_string
@@ -187,6 +187,8 @@ with gr.Blocks() as demo:
             - Describe an SVG: Upload, paste or generate an SVG file, Select the prompt template 'Describe SVG' and click 'Submit' """
         )
 
+    # load env variables
+    status, env_apiendpoint, env_apikey, env_projectid = load_credentials()
     # init state - note gr.State() initial value must be deep-copyable - my wx_engine class is not
     wx_engine_state = gr.State(None)
     with gr.Column():
@@ -230,13 +232,13 @@ with gr.Blocks() as demo:
                         # credentials
                         with gr.Accordion("Credentials:", open=True):
                             wx_creds_endpoint = gr.Textbox(
-                                label="Endpoint",
-                                value="https://us-south.ml.cloud.ibm.com",
-                                max_lines=1,
+                                label="Endpoint", value=env_apiendpoint, max_lines=1
+                            )
+                            wx_creds_apikey = gr.Textbox(
+                                label="API key", value=env_apikey, max_lines=1
                             )
-                            wx_creds_apikey = gr.Textbox(label="API key", max_lines=1)
                             wx_creds_projectid = gr.Textbox(
-                                label="Project id", max_lines=1
+                                label="Project id", value=env_projectid, max_lines=1
                             )
                             wx_connect_btn = gr.Button("Connect")
                         # model