web: Fix timezone

web/backend/Dockerfile

@@ -5,12 +5,16 @@ WORKDIR /app
 # Install project & dependencies
 COPY Project.toml /app/Backend/
 COPY src /app/Backend/src
-RUN julia --project=. -e 'using Pkg; Pkg.develop(path="Backend"); Pkg.add("HiGHS"); Pkg.precompile()'
+RUN julia --project=. -e 'using Pkg; Pkg.develop(path="Backend"); Pkg.add("HiGHS"); Pkg.add("JuMP"); Pkg.precompile()'
 COPY docker/startup.jl ./
 
+# Set timezone to Chicago
+ENV TZ=America/Chicago
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
 # Set default environment variables
 ENV UCJL_HOST="0.0.0.0"
 ENV UCJL_PORT="9000"
 
 # Run the server
-CMD ["julia", "--project=.", "startup.jl"]
+CMD ["julia", "--threads", "1", "--procs", "1", "--project=.", "startup.jl"]

web/backend/Makefile

@@ -2,4 +2,14 @@ docker-build:
 	docker build . -t ucjl-backend
 
 docker-run:
-	docker run --publish 9000:9000 --rm -it ucjl-backend
+	docker stop ucjl-backend
+	docker rm ucjl-backend
+	docker run \
+		--restart always \
+		--detach \
+		--network custom \
+		--name ucjl-backend \
+		--volume ucjl_data:/app/Backend/jobs \
+		--memory 16g \
+		--cpus 4 \
+		ucjl-backend

web/backend/Project.toml

@@ -5,13 +5,21 @@ authors = ["Alinson S. Xavier <git@axavier.org>"]
 
 [deps]
 CodecZlib = "944b1d66-785c-5afd-91f1-9de20f533193"
+Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
+Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
 HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
+Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
+Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 UnitCommitment = "64606440-39ea-11e9-0f29-3303a1d3d877"
 
 [compat]
 CodecZlib = "0.7.8"
+Dates = "1.11.0"
+Distributed = "1.11.0"
 HTTP = "1.10.19"
 JSON = "0.21.4"
+Logging = "1.11.0"
+Printf = "1.11.0"
 Random = "1.11.0"

web/backend/docker/startup.jl

@@ -6,6 +6,7 @@
 
 # Load required packages
 using HiGHS
+using JuMP
 using Backend
 
 const UCJL_HOST = get(ENV, "HOST", "0.0.0.0")
@@ -16,7 +17,8 @@ println("Host: $UCJL_HOST")
 println("Port: $UCJL_PORT")
 println("Press Ctrl+C to stop the server")
 
-server = Backend.start_server(UCJL_HOST, UCJL_PORT; optimizer = HiGHS.Optimizer)
+Backend.setup_logger()
+server = Backend.start_server(UCJL_HOST, UCJL_PORT; optimizer = optimizer_with_attributes(HiGHS.Optimizer, "mip_rel_gap" => 0.001))
 try
     wait()
 catch e

web/backend/src/Backend.jl

@@ -8,5 +8,6 @@ basedir = joinpath(dirname(@__FILE__), "..")
 
 include("jobs.jl")
 include("server.jl")
+include("log.jl")
 
 end

web/backend/src/jobs.jl

@@ -2,18 +2,19 @@
 # Copyright (C) 2025, UChicago Argonne, LLC. All rights reserved.
 # Released under the modified BSD license. See COPYING.md for more details.
 
+using Distributed
 import Base: put!
 
 Base.@kwdef mutable struct JobProcessor
-    pending::Channel{String} = Channel{String}(Inf)
-    processing::Channel{String} = Channel{String}(Inf)
-    shutdown::Channel{Bool} = Channel{Bool}(1)
-    worker_task::Union{Task,Nothing} = nothing
-    work_fn::Function
+    pending = RemoteChannel(() -> Channel{String}(Inf))
+    processing = RemoteChannel(() -> Channel{String}(Inf))
+    shutdown = RemoteChannel(() -> Channel{Bool}(1))
+    worker_pid = nothing
+    monitor_task = nothing
+    work_fn = nothing
 end
 
 function Base.put!(processor::JobProcessor, job_id::String)
-    @info "New job received: $job_id"
     return put!(processor.pending, job_id)
 end
 
@@ -21,46 +22,58 @@ function isbusy(processor::JobProcessor)
     return isready(processor.pending) || isready(processor.processing)
 end
 
-function run!(processor::JobProcessor)
+function worker_loop(pending, processing, shutdown, work_fn)
+    @info "Starting worker loop"
     while true
         # Check for shutdown signal
-        if isready(processor.shutdown)
+        if isready(shutdown)
+            @info "Shutdown signal received"
             break
         end
 
         # Wait for a job with timeout
-        if !isready(processor.pending)
+        if !isready(pending)
             sleep(0.1)
             continue
         end
 
         # Move job from pending to processing queue
-        job_id = take!(processor.pending)
-        put!(processor.processing, job_id)
+        job_id = take!(pending)
+        put!(processing, job_id)
+        @info "Job started: $job_id"
 
         # Run work function
-        processor.work_fn(job_id)
+        try
+            work_fn(job_id)
+        catch e
+            @error "Job failed: job $job_id"
+        end
 
         # Remove job from processing queue
-        take!(processor.processing)
+        take!(processing)
+        @info "Job finished: $job_id"
     end
 end
 
 function start(processor::JobProcessor)
-    processor.worker_task = @async run!(processor)
+    processor.monitor_task = @spawn begin
+        worker_loop(
+            processor.pending,
+            processor.processing,
+            processor.shutdown,
+            processor.work_fn,
+        )
+    end
     return
 end
 
 function stop(processor::JobProcessor)
-    # Signal worker to stop
     put!(processor.shutdown, true)
-
-    # Wait for worker to finish
-    if processor.worker_task !== nothing
+    if processor.monitor_task !== nothing
         try
-            wait(processor.worker_task)
-        catch
-            # Worker may have already exited
+            wait(processor.monitor_task)
+        catch e
+            @warn "Error waiting for worker task" exception=e
         end
     end
     return

web/backend/src/log.jl

@@ -0,0 +1,36 @@
+# UnitCommitment.jl: Optimization Package for Security-Constrained Unit Commitment
+# Copyright (C) 2025, UChicago Argonne, LLC. All rights reserved.
+# Released under the modified BSD license. See COPYING.md for more details.
+
+import Logging: min_enabled_level, shouldlog, handle_message
+using Base.CoreLogging, Logging, Dates
+
+struct TimeLogger <: AbstractLogger end
+
+min_enabled_level(::TimeLogger) = CoreLogging.Info
+shouldlog(logger::TimeLogger, level, _module, group, id) = true
+
+function handle_message(
+    logger::TimeLogger,
+    level,
+    message,
+    _module,
+    group,
+    id,
+    filepath,
+    line;
+    kwargs...,
+)
+    current_time = Dates.format(now(), "yyyy-mm-dd HH:MM:SS.sss")
+    print("[$current_time] ")
+    println(message)
+    flush(stdout)
+    flush(stderr)
+    return Base.Libc.flush_cstdio()
+end
+
+function setup_logger()
+    global_logger(TimeLogger())
+    @spawn global_logger(TimeLogger())
+    return
+end

web/backend/src/server.jl

@@ -99,7 +99,7 @@ function start_server(host, port; optimizer)
                             instance,
                             optimizer = optimizer,
                         )
-                        UnitCommitment.optimize!(model)
+                        UnitCommitment.optimize!(model, UnitCommitment.XavQiuWanThi2019.Method(time_limit=900.0))
                         solution = UnitCommitment.solution(model)
                         UnitCommitment.write(solution_filename, solution)
                         return
@@ -107,7 +107,6 @@ function start_server(host, port; optimizer)
                 end
             end
         catch e
-            @error "Failed job: $job_id" e
             open(log_filename, "a") do io
                 println(io, "\nError: ", e)
                 println(io, "\nStacktrace:")

web/backend/test/Project.toml

@@ -6,18 +6,18 @@ authors = ["Alinson S. Xavier <git@axavier.org>"]
 [deps]
 Backend = "948642ed-e3f9-4642-9296-0f1eaf40c938"
 CodecZlib = "944b1d66-785c-5afd-91f1-9de20f533193"
+Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
 HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
 HiGHS = "87dc4568-4c63-4d18-b0c0-bb2238e4078b"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 JuliaFormatter = "98e50ef6-434e-11e9-1051-2b60c6c9e899"
-Revise = "295af30f-e4ad-537b-8983-00126c2a3abe"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [compat]
 CodecZlib = "0.7.8"
+Distributed = "1.11.0"
 HTTP = "1.10.19"
 HiGHS = "1.20.1"
 JSON = "0.21.4"
 JuliaFormatter = "2.2.0"
-Revise = "3.12.0"
 Test = "1.11.0"

web/backend/test/src/BackendT.jl

@@ -4,6 +4,8 @@
 
 module BackendT
 
+using Distributed
+
 using Test
 using HTTP
 using JSON
@@ -22,6 +24,7 @@ function fixture(path::String)::String
 end
 
 function runtests()
+    Backend.setup_logger()
     @testset "UCJL Backend" begin
         server_test_usage()
         jobs_test_usage()

web/backend/test/src/jobs_test.jl

@@ -7,10 +7,14 @@ using Test
 
 function jobs_test_usage()
     @testset "JobProcessor" begin
-        # Define dummy work function
-        received_job_id = []
+        # Create a temporary directory for test output
+        test_dir = mktempdir()
+
+        # Define dummy work function that writes to a file
+        # Note: This function will be executed on a worker process
         function work_fn(job_id)
-            push!(received_job_id, job_id)
+            output_file = joinpath(test_dir, job_id * ".txt")
+            write(output_file, job_id)
             return
         end
 
@@ -24,10 +28,16 @@ function jobs_test_usage()
         put!(processor, "test")
 
         # Wait for job to complete
-        sleep(0.1)
+        # Increased timeout to account for worker process startup
+        sleep(2)
         stop(processor)
 
         # Check that the work function was called with correct job_id
-        @test received_job_id[1] == "test"
+        output_file = joinpath(test_dir, "test.txt")
+        @test isfile(output_file)
+        @test read(output_file, String) == "test"
+
+        # Clean up
+        rm(test_dir; recursive = true)
     end
 end

web/backend/test/src/server_test.jl

@@ -13,7 +13,7 @@ function server_test_usage()
 
         # Submit test case
         response = HTTP.post(
-            "http://$HOST:$PORT/submit",
+            "http://$HOST:$PORT/api/submit",
             ["Content-Type" => "application/gzip"],
             compressed_data,
         )
@@ -26,7 +26,7 @@ function server_test_usage()
         @test length(job_id) == 16
 
         # Wait for jobs to finish
-        sleep(0.1)
+        sleep(5)
         while isbusy(server.processor)
             sleep(0.1)
         end
@@ -43,7 +43,7 @@ function server_test_usage()
         @test saved_data == compressed_data
 
         # Query job information
-        view_response = HTTP.get("http://$HOST:$PORT/jobs/$job_id/view")
+        view_response = HTTP.get("http://$HOST:$PORT/api/jobs/$job_id/view")
         @test view_response.status == 200
 
         # Check response

web/frontend/Dockerfile

@@ -4,13 +4,15 @@ WORKDIR /app
 COPY package*.json ./
 RUN npm install
 COPY . .
+ARG REACT_APP_BACKEND_URL
+ENV REACT_APP_BACKEND_URL=$REACT_APP_BACKEND_URL
 RUN npm run build
  
-# Production Stage
-FROM node:18-alpine AS production
-WORKDIR /app
-COPY --from=build /app/build ./build
-COPY server.js ./
-RUN npm install --production express
-EXPOSE 3000
-CMD ["node", "server.js"]
+ # Production Stage
+ FROM node:18-alpine AS production
+ WORKDIR /app
+ COPY --from=build /app/build ./build
+ COPY server.js ./
+ RUN npm install --production express
+ EXPOSE 3000
+ CMD ["node", "server.js"]

web/frontend/Makefile

@@ -1,5 +1,14 @@
 docker-build:
-	docker build . -t ucjl-frontend
+	docker build . \
+		--build-arg REACT_APP_BACKEND_URL=https://ucjl.axavier.org/api \
+		-t ucjl-frontend
 
 docker-run:
-	docker run -e REACT_APP_BACKEND_URL=http://localhost:9000/api --publish 3000:3000 --rm -it ucjl-frontend
+	docker stop ucjl-frontend
+	docker rm ucjl-frontend
+	docker run \
+		--detach \
+		--network custom \
+		--restart always \
+		--name ucjl-frontend \
+		ucjl-frontend