Merge pull request #12 from UCSD-Makerspace/dev

dev

Author: timothywashburn

.github/workflows/build.yml

@@ -4,10 +4,11 @@ on:
   push:
     branches:
       - main
+      - dev
   workflow_dispatch:
 
 concurrency:
-  group: production_environment
+  group: ${{ github.ref_name }}_environment
   cancel-in-progress: true
 
 jobs:
@@ -23,6 +24,17 @@ jobs:
         id: lowercase
         run: echo "owner=$(echo '${{ github.repository_owner }}' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
 
+      - name: Set image name
+        id: image
+        run: |
+          if [ "${{ github.ref_name }}" = "dev" ]; then
+            echo "name=check-in-dev" >> $GITHUB_OUTPUT
+            echo "extra_tag=ghcr.io/${{ steps.lowercase.outputs.owner }}/check-in-dev:latest" >> $GITHUB_OUTPUT
+          else
+            echo "name=check-in" >> $GITHUB_OUTPUT
+            echo "extra_tag=ghcr.io/${{ steps.lowercase.outputs.owner }}/check-in:latest" >> $GITHUB_OUTPUT
+          fi
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -39,5 +51,5 @@ jobs:
           context: .
           push: true
           tags: |
-            ghcr.io/${{ steps.lowercase.outputs.owner }}/check-in:${{ github.sha }}
-            ghcr.io/${{ steps.lowercase.outputs.owner }}/check-in:latest
+            ghcr.io/${{ steps.lowercase.outputs.owner }}/${{ steps.image.outputs.name }}:${{ github.sha }}
+            ${{ steps.image.outputs.extra_tag }}

Dockerfile

@@ -1,9 +1,7 @@
-FROM python:3.13-slim
+FROM python:3.13
 
 RUN apt-get update && apt-get install -y \
-    python3-tk \
-    gcc \
-    python3-dev \
+    libqt6widgets6 \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app

docker-compose.yml

@@ -1,6 +1,7 @@
 services:
   check-in:
     image: ghcr.io/ucsd-makerspace/check-in:latest
+    pull_policy: always
     privileged: true
     network_mode: host
     environment:

fonts/Montserrat-VariableFont_wght.ttf

@@ -2,3 +2,6 @@ pyserial==3.5
 requests==2.32.5
 adafruit-circuitpython-pn532
 RPi.GPIO; sys_platform == 'linux'
+pyqt6==6.11.0
+qtawesome
+pyqt6-sip

install.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -a
+source "$(dirname "$0")/.env"
+set +a
+
+for arg in "$@"; do
+    if [ "$arg" = "--dev" ] || [ "$arg" = "-d" ]; then
+        export DEV_MODE=1
+        break
+    fi
+done
+
+output_file="log.txt"
+
+echo "" >> "$output_file"
+
+date "+%Y-%m-%d %H:%M:%S" >> "$output_file"
+
+python src/main.py "$@" 2>&1 | tee -a log.txt

requirements.txt

@@ -0,0 +1,12 @@
+import logging
+import time
+
+import requests
+
+
+def _req(method, url, **kwargs):
+    start = time.time()
+    resp = requests.request(method, url, **kwargs)
+    ms = (time.time() - start) * 1000
+    logging.info(f"[CLIENT] {method.upper()} {url} -> {resp.status_code} ({ms:.0f}ms)")
+    return resp

run_dev.sh

@@ -2,18 +2,10 @@
 import sys
 import time
 
-import requests
-
 from config import API_BASE_URL
+from api._client import _req
 
 
-def _req(method, url, **kwargs):
-    start = time.time()
-    resp = requests.request(method, url, **kwargs)
-    ms = (time.time() - start) * 1000
-    logging.info(f"[CLIENT] {method.upper()} {url} -> {resp.status_code} ({ms:.0f}ms)")
-    return resp
-
 
 def check_api_health(retries=3, delay=3):
     logging.info(API_BASE_URL)
@@ -31,7 +23,7 @@ def check_api_health(retries=3, delay=3):
     sys.exit(1)
 
 
-class SheetManager:
+class ApiClient:
     def checkin_by_uuid(self, uuid):
         try:
             resp = _req("GET", f"{API_BASE_URL}/check-in/uuid/{uuid}", timeout=10)
@@ -58,26 +50,50 @@ def set_traffic_light(self, color):
 
     def get_traffic_light(self):
         try:
-            resp = requests.get(f"{API_BASE_URL}/traffic-light", timeout=5)
+            resp = _req("GET", f"{API_BASE_URL}/traffic-light", timeout=5)
             return resp.json().get("color", "off")
         except Exception as e:
             logging.error(f"Error getting traffic light: {e}")
             return "off"
 
-    def create_account(self, first_name, last_name, email, pid, rfid):
+    def lookup_by_pid(self, pid):
+        """Returns dict with first_name/last_name/email/pid, or None if not found."""
+        try:
+            resp = _req("GET", f"{API_BASE_URL}/accounts/lookup/pid/{pid}", timeout=10)
+            if resp.status_code == 404:
+                return None
+            resp.raise_for_status()
+            return resp.json()
+        except Exception as e:
+            logging.error(f"Error looking up student by pid {pid}: {e}")
+            return None
+
+    def lookup_by_barcode(self, barcode):
+        """Returns dict with first_name/last_name/email/pid, or None if not found."""
+        try:
+            resp = _req("GET", f"{API_BASE_URL}/accounts/lookup/barcode/{barcode}", timeout=10)
+            if resp.status_code == 404:
+                return None
+            resp.raise_for_status()
+            return resp.json()
+        except Exception as e:
+            logging.error(f"Error looking up student by barcode: {e}")
+            return None
+
+    def create_account(self, rfid, *, barcode=None, pid=None, first_name=None, last_name=None, email=None):
         try:
-            resp = _req(
-                "POST",
-                f"{API_BASE_URL}/accounts",
-                json={
-                    "first_name": first_name,
-                    "last_name": last_name,
-                    "email": email,
-                    "pid": pid,
-                    "rfid": rfid,
-                },
-                timeout=30,
-            )
+            payload = {"rfid": rfid}
+            if barcode:
+                payload["barcode"] = barcode
+            if pid:
+                payload["pid"] = pid
+            if first_name:
+                payload["first_name"] = first_name
+            if last_name:
+                payload["last_name"] = last_name
+            if email:
+                payload["email"] = email
+            resp = _req("POST", f"{API_BASE_URL}/accounts", json=payload, timeout=30)
             resp.raise_for_status()
             return resp.json()
         except Exception as e: