Merge pull request #124 from ks6088ts-labs/feature/issue-123_refactor-frontend

move entrypoint for frontend app

Author: ks6088ts

Makefile

@@ -101,18 +101,14 @@ ci-test-docker: docker-compose-lint ## run CI test for Docker
 # ---
 # Application
 # ---
-SOLUTION_NAME ?= "SANDBOX"
-BACKEND_URL ?= "http://localhost:8000"
-
 .PHONY: backend
 backend: ## run backend
 	poetry run python main.py backend --reload
 
 .PHONY: frontend
 frontend: ## run frontend
-	poetry run streamlit run main.py -- frontend -- \
-		--solution-name=$(SOLUTION_NAME) \
-		--backend-url=$(BACKEND_URL)
+	cd frontend \
+		&& poetry run streamlit run main.py
 
 # ---
 # Azure Functions

compose.yaml

@@ -4,7 +4,7 @@ services:
       context: .
       dockerfile: dockerfiles/backend.Dockerfile
     image: ks6088ts/azure-ai-services-solutions:backend-latest
-    command: python main.py backend --port 8888 --debug
+    command: python main.py backend --port 8888
     ports:
       - 8888:8888
     volumes:
@@ -16,7 +16,7 @@ services:
       context: .
       dockerfile: dockerfiles/frontend.Dockerfile
     image: ks6088ts/azure-ai-services-solutions:frontend-latest
-    command: streamlit run main.py --server.port=8501 --server.address=0.0.0.0 -- frontend --solution-name sandbox --backend-url http://backend:8888 --debug
+    command: streamlit run frontend/main.py
     ports:
       - 8501:8501
     volumes:

dockerfiles/frontend.Dockerfile

@@ -21,4 +21,4 @@ COPY . .
 # Install dependencies
 RUN pip install --no-cache-dir --upgrade -r /app/requirements.txt
 
-CMD ["python", "main.py", "frontend", "--help"]
+CMD ["streamlit", "run", "frontend/main.py", "--help"]

settings/frontend.env.sample renamed to frontend/.env.sample

@@ -0,0 +1,24 @@
+import streamlit as st
+
+
+def init_page():
+    st.set_page_config(page_title="Azure AI Solutions", page_icon="🧐")
+
+
+def main():
+    init_page()
+
+    st.sidebar.success("Please select apps from the sidebar menu")
+
+    st.markdown(
+        """
+    ### Welcome to Azure AI Solutions
+
+    - This app shows some use cases with Azure AI Services
+    - Got to the pages from the left menu
+    """
+    )
+
+
+if __name__ == "__main__":
+    main()

frontend/__init__.py

@@ -4,13 +4,12 @@
 from urllib.parse import urljoin
 
 import streamlit as st
-
-from frontend.solutions.utilities import http_post_file
+from utilities import http_post_file
 
 logger = logging.getLogger(__name__)
 
 
-def start(
+def main(
     backend_url: str,
     log_level: int,
 ):
@@ -43,3 +42,10 @@ def start(
                 st.write(response)
     else:
         st.warning("Please upload a file first")
+
+
+if __name__ == "__main__":
+    main(
+        backend_url="http://localhost:8000",
+        log_level=logging.DEBUG,
+    )

frontend/entrypoint.py

@@ -6,10 +6,10 @@
 from openai import AzureOpenAI
 
 logger = logging.getLogger(__name__)
-load_dotenv("./settings/frontend.env")
+load_dotenv()
 
 
-def start(
+def main(
     backend_url: str,
     log_level: int,
 ):
@@ -52,3 +52,10 @@ def start(
                     assistant_text += content
                     placeholder.write(assistant_text)
             st.session_state.messages.append({"role": "assistant", "content": assistant_text})
+
+
+if __name__ == "__main__":
+    main(
+        backend_url="http://localhost:8000",
+        log_level=logging.DEBUG,
+    )

frontend/main.py

@@ -4,13 +4,12 @@
 from urllib.parse import urljoin
 
 import streamlit as st
-
-from frontend.solutions.utilities import http_post_file
+from utilities import http_post_file
 
 logger = logging.getLogger(__name__)
 
 
-def start(
+def main(
     backend_url: str,
     log_level: int,
 ):
@@ -41,3 +40,10 @@ def start(
                     )
                 )
                 st.write(response)
+
+
+if __name__ == "__main__":
+    main(
+        backend_url="http://localhost:8000",
+        log_level=logging.DEBUG,
+    )