Merge pull request #72 from ks6088ts-labs/feature/issue-71_support-datasource

add camera datasource

Author: ks6088ts

.github/workflows/docker-release.yaml

@@ -6,7 +6,6 @@ on:
 jobs:
   release:
     runs-on: "ubuntu-latest"
-    timeout-minutes: 5
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4

.github/workflows/docker.yaml

@@ -12,7 +12,6 @@ on:
 jobs:
   docker:
     runs-on: "ubuntu-latest"
-    timeout-minutes: 5
     steps:
       - uses: actions/checkout@v4
         with:

.github/workflows/ghcr.yaml

@@ -8,7 +8,6 @@ env:
 jobs:
   ghcr:
     runs-on: ubuntu-latest
-    timeout-minutes: 5
     permissions:
       packages: write
       contents: read

.github/workflows/test.yaml

@@ -20,7 +20,6 @@ jobs:
         python-version:
           - "3.10"
     runs-on: ${{ matrix.platform }}
-    timeout-minutes: 5
     steps:
       - uses: actions/checkout@v4
       - name: Set up Poetry

Dockerfile

@@ -15,10 +15,16 @@ ARG GIT_TAG="x.x.x"
 
 WORKDIR /app
 
-COPY --from=requirements-stage /tmp/requirements.txt /app/requirements.txt
+COPY --from=requirements-stage /tmp/requirements.txt /app/requirements.gen.txt
 COPY . .
 
+# Install packages: https://stackoverflow.com/a/68666500/4457856
+# hadolint ignore=DL3008
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends ffmpeg libsm6 libxext6 \
+    && rm -rf /var/lib/apt/lists/*
+
 # Install dependencies
-RUN pip install --no-cache-dir --upgrade -r /app/requirements.txt
+RUN pip install --no-cache-dir --upgrade -r /app/requirements.gen.txt
 
 CMD ["python", "-m", "streamlit", "run", "apps/99_streamlit_examples/main.py"]

apps/99_streamlit_examples/pages/10_Object_detection.py

@@ -18,23 +18,35 @@
         key="model_name",
         index=0,
     )
+    data_source = st.selectbox(
+        label="Select a data source",
+        options=[
+            "file",
+            "camera",
+        ],
+        key="data_source",
+        index=0,
+    )
 
 
 st.title("Object detection")
 
-st.info("Upload an image and AI will detect objects in the image.")
-
-uploaded_file = st.file_uploader(
-    "Upload an image",
-    type=(
-        "jpg",
-        "jpeg",
-        "png",
-        "gif",
-        "bmp",
-        "tiff",
-    ),
-)
+if data_source == "camera":
+    st.info("AI will detect objects in the camera image.")
+    uploaded_file = st.camera_input("Take a picture")
+if data_source == "file":
+    st.info("Upload an image and AI will detect objects in the image.")
+    uploaded_file = st.file_uploader(
+        "Upload an image",
+        type=(
+            "jpg",
+            "jpeg",
+            "png",
+            "gif",
+            "bmp",
+            "tiff",
+        ),
+    )
 if uploaded_file is not None:
     button = st.button("Detect objects")
 

apps/99_streamlit_examples/pages/11_Pose_estimation.py

@@ -28,23 +28,36 @@
         index=1,
         key="model_complexity",
     )
+    data_source = st.selectbox(
+        label="Select a data source",
+        options=[
+            "file",
+            "camera",
+        ],
+        key="data_source",
+        index=0,
+    )
 
 
 st.title("Pose estimation")
 
-st.info("Upload an image and AI will estimate the pose.")
+if data_source == "camera":
+    st.info("AI will detect objects in the camera image.")
+    uploaded_file = st.camera_input("Take a picture")
+if data_source == "file":
+    st.info("Upload an image and AI will estimate the pose.")
+    uploaded_file = st.file_uploader(
+        "Upload an image",
+        type=(
+            "jpg",
+            "jpeg",
+            "png",
+            "gif",
+            "bmp",
+            "tiff",
+        ),
+    )
 
-uploaded_file = st.file_uploader(
-    "Upload an image",
-    type=(
-        "jpg",
-        "jpeg",
-        "png",
-        "gif",
-        "bmp",
-        "tiff",
-    ),
-)
 if uploaded_file is not None:
     button = st.button("Estimate pose")
 

requirements.txt

@@ -9,5 +9,9 @@ langchain-openai==0.1.20
 langchain-community==0.2.11
 azure-search-documents==11.5.1
 azure-identity==1.17.1
-ultralytics==8.2.77
-mediapipe==0.10.14
+
+# To run 99_streamlit_examples/pages/10_Object_Detection.py
+# ultralytics==8.2.77
+
+# To run 99_streamlit_examples/pages/11_Pose_Estimation.py
+# mediapipe==0.10.14