Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion apps/frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# 1. Install dependencies only when needed
FROM node:18-alpine AS deps
FROM node:20-alpine AS deps

WORKDIR /app

Expand Down Expand Up @@ -35,6 +35,7 @@ COPY --from=builder /app/public ./public
COPY --from=builder /app/.next ./.next
COPY --from=builder /app/node_modules ./node_modules
COPY --from=builder /app/package.json ./package.json
COPY --from=builder /app/next.config.ts ./

# Expose the port Next.js runs on
EXPOSE 3000
Expand Down
14 changes: 14 additions & 0 deletions apps/frontend/next.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@ import type { NextConfig } from "next";

const nextConfig: NextConfig = {
/* config options here */
experimental: {
serverActions: {
bodySizeLimit: '100mb',
},
},

async rewrites() {
return [
{
source: '/api/:path*',
destination: 'http://backend:8000/api/:path*' // Routes traffic safely inside the Docker network
}
];
}
};

export default nextConfig;
5 changes: 1 addition & 4 deletions apps/frontend/src/app/_home/UploadButtons.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,8 @@ import { cn } from "@/lib/utils";
import { UploadDataType, UploadModalityType } from "@/enums";
import { Upload as UploadIcon } from "lucide-react";
import { useAppContext } from "@/providers/AppProvider";
import { findNiftiFile, findRelevantFiles } from "@/utils";
import { getReport } from "@/services/apiReport";
import { toast } from "sonner";
import { useRouter } from "next/navigation";
import { IAllRelevantFilesType } from "@/types";
import { handleBidsUpload, handleDicomUpload } from "./uploadHandlers";

type TUploadDataOptions = (typeof UploadDataType)[keyof typeof UploadDataType];
Expand Down Expand Up @@ -62,7 +59,7 @@ const UploadButtons = () => {
setApiData(data);
if (
data.missing_required_parameters &&
data.missing_required_parameters.length > 0
Number(data.missing_required_parameters.length) > 0
) {
toast.info(
"Report generated with missing parameters. Please provide the missing values."
Expand Down
2 changes: 2 additions & 0 deletions apps/frontend/src/app/_home/uploadHandlers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,9 @@ const handleBidsUpload = async ({
files: FileList;
setIsLoading: (v: boolean) => void;
setUploadedFiles: (files: IAllRelevantFilesType) => void;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
setUploadConfig: (config: any) => void;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
setUpdatedJsonContent: (content: any) => void;
setUpdatedJsonFilename: (filename: string) => void;
activeModalityTypeOption: UploadModalityType;
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/src/services/apiReport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import axios from 'axios';
import {IReportApiResponse} from '@/types';


const API_BASE_URL = `${process.env.NEXT_PUBLIC_API_BASE_URL}/report`;
const API_BASE_URL = `/api/report`;

const client = axios.create({
baseURL: API_BASE_URL,
Expand Down
21 changes: 8 additions & 13 deletions package/src/pyaslreport/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,30 +40,25 @@ def get_bids_metadata(data):
def get_dicom_header(dicom_dir: str):
"""
Extracts the DICOM header from the provided DICOM files.
Optimized to return immediately upon finding the first valid DICOM file, preventing unnecessary O(N) disk I/O on large medical datasets.

:param dicom_dir: Directory containing DICOM files.
:return: DICOM header from the first valid DICOM file found.
"""
# Get all files in the directory
all_files = [f for f in os.listdir(dicom_dir) if os.path.isfile(os.path.join(dicom_dir, f))]

# Try to find DICOM files by attempting to read them with pydicom
dcm_files = []
for file in all_files:
file_path = os.path.join(dicom_dir, file)
try:
# Try to read the file as DICOM
pydicom.dcmread(file_path, stop_before_pixels=True)
dcm_files.append(file)
# Try to read the file as DICOM and return immediately if successful
dcm_header = pydicom.dcmread(file_path, stop_before_pixels=True)
log.info(f"Successfully extracted DICOM header from {file}")
return dcm_header
except (InvalidDicomError, OSError, PermissionError):
# File is not a valid DICOM file or cannot be read
continue

log.info(f"Found {len(dcm_files)} DICOM files in {dicom_dir}")

if not dcm_files:
raise ValueError(f"No DICOM files found in directory: {dicom_dir}")

# Read the first valid DICOM file
dcm_header = pydicom.dcmread(os.path.join(dicom_dir, dcm_files[0]))

return dcm_header
log.error(f"No valid DICOM files found in directory: {dicom_dir}")
raise ValueError(f"No DICOM files found in directory: {dicom_dir}")