Merge branch 'main' of https://devone.aplikasi.web.id/gitea/mario/pydicom-migrasi-clarity into main
This commit is contained in:
mario
332
main.py
332
main.py
@@ -15,6 +15,7 @@ from utils.cleanup import register_exit_handlers, register_cleanup_dir
|
||||
from services.dicom_finder import DicomFinder
|
||||
from services.dicom_retriever import DicomRetriever
|
||||
from services.dicom_sender import DicomSender
|
||||
import signal
|
||||
|
||||
def parse_args():
|
||||
"""Parse command line arguments."""
|
||||
@@ -63,6 +64,11 @@ def parse_args():
|
||||
send_file_parser = subparsers.add_parser('send-file', help='Send a single DICOM file to destination PACS')
|
||||
send_file_parser.add_argument('--file-path', required=True, help='Path to DICOM file to send')
|
||||
|
||||
# Add to the parse_args() function after the 'process' command
|
||||
process_study_parser = subparsers.add_parser('process-study', help='Process full workflow for a specific study by StudyInstanceUID')
|
||||
process_study_parser.add_argument('--study-uid', required=True, help='StudyInstanceUID to process')
|
||||
process_study_parser.add_argument('--log-dir', help='Directory to save JSON logs (default: JSON_OUTPUT_DIR)')
|
||||
|
||||
# Process command - full workflow: find, get, and send DICOM data for a date range
|
||||
process_parser = subparsers.add_parser('process', help='Process full workflow (find, get, send) for a date range')
|
||||
process_parser.add_argument('--start-date', required=True, help='Start date in YYYYMMDD format')
|
||||
@@ -357,6 +363,150 @@ def send_file(args):
|
||||
logger.error(f"Error sending file: {str(e)}")
|
||||
sys.exit(1)
|
||||
|
||||
def process_single_study(study_uid, accession_number=None, log_dir=None):
|
||||
"""
|
||||
Process a single study: retrieve it, send to destination PACS,
|
||||
and create detailed JSON logs.
|
||||
|
||||
Args:
|
||||
study_uid: Study Instance UID
|
||||
accession_number: Optional accession number
|
||||
log_dir: Directory to save logs
|
||||
|
||||
Returns:
|
||||
dict: Result information
|
||||
"""
|
||||
log_dir = log_dir or settings.JSON_OUTPUT_DIR
|
||||
|
||||
# Create services
|
||||
finder = DicomFinder()
|
||||
retriever = DicomRetriever()
|
||||
sender = DicomSender()
|
||||
|
||||
# First, get the study metadata with a query if not provided
|
||||
if not accession_number:
|
||||
study_metadata = finder.find_study_by_uid(study_uid)
|
||||
if not study_metadata:
|
||||
logger.error(f"Study not found: {study_uid}")
|
||||
return {'success': False, 'error': 'Study not found'}
|
||||
accession_number = getattr(study_metadata, 'AccessionNumber', '')
|
||||
else:
|
||||
study_metadata = None
|
||||
|
||||
logger.info(f"Processing study: {accession_number} with Study_IUID ({study_uid})")
|
||||
|
||||
# STEP 1: Retrieve the study
|
||||
retrieve_result = retriever.retrieve_study(study_uid, accession_number=accession_number)
|
||||
|
||||
if not retrieve_result['success']:
|
||||
logger.error(f"Failed to retrieve study {study_uid}: {retrieve_result['status']}")
|
||||
return {'success': False, 'error': f"Failed to retrieve study: {retrieve_result['status']}"}
|
||||
|
||||
logger.info(f"Retrieved {retrieve_result['successful_instances']} instances for study {study_uid}")
|
||||
|
||||
# STEP 2: Send the study to destination PACS
|
||||
send_result = sender.send_study(os.path.join(settings.DICOM_STORE_DIR, study_uid))
|
||||
|
||||
if not send_result['success']:
|
||||
logger.error(f"Failed to send study {study_uid}: {send_result.get('error', 'Unknown error')}")
|
||||
|
||||
logger.info(f"Sent {send_result['successful_sends']} of {send_result['total_files']} files to destination PACS")
|
||||
|
||||
# STEP 3: Find all series and create detailed logs
|
||||
series_list = finder.find_series_for_study(study_uid, accession_number=accession_number)
|
||||
|
||||
# Get metadata from study_metadata if available, otherwise from the first element of study list
|
||||
if study_metadata:
|
||||
study_date = getattr(study_metadata, 'StudyDate', '')
|
||||
study_time = getattr(study_metadata, 'StudyTime', '000000')
|
||||
patient_id = getattr(study_metadata, 'PatientID', '')
|
||||
study_description = getattr(study_metadata, 'StudyDescription', '')
|
||||
else:
|
||||
# We need to query for it again
|
||||
study_details = finder.find_study_by_uid(study_uid)
|
||||
study_date = getattr(study_details, 'StudyDate', '') if study_details else ''
|
||||
study_time = getattr(study_details, 'StudyTime', '000000') if study_details else '000000'
|
||||
patient_id = getattr(study_details, 'PatientID', '') if study_details else ''
|
||||
study_description = getattr(study_details, 'StudyDescription', '') if study_details else ''
|
||||
|
||||
study_datetime = f"{study_date}{study_time}"
|
||||
|
||||
study_log = {
|
||||
'Study_IUID': study_uid,
|
||||
'AccessionNumber': accession_number,
|
||||
'PatientID': patient_id,
|
||||
'StudyDescription': study_description,
|
||||
'StudyDateTime': study_datetime,
|
||||
'CstoreSuccess': send_result['success'],
|
||||
'Series': []
|
||||
}
|
||||
|
||||
for series in series_list:
|
||||
series_uid = series.SeriesInstanceUID
|
||||
|
||||
# Get first instance for the series
|
||||
instance = finder.find_first_instance_for_series(study_uid, series_uid)
|
||||
|
||||
# Kalau null atau None, forced ke ''
|
||||
def safe_get_attr(obj, attr_name, default=''):
|
||||
"""Get attribute value, ensuring None is converted to default."""
|
||||
value = getattr(obj, attr_name, default)
|
||||
return default if value is None else str(value)
|
||||
|
||||
series_info = {
|
||||
'Series_IUID': safe_get_attr(series, 'SeriesInstanceUID'),
|
||||
'SeriesNumber': safe_get_attr(series, 'SeriesNumber'),
|
||||
'SeriesDescription': safe_get_attr(series, 'SeriesDescription'),
|
||||
'NumberOfInstances': safe_get_attr(series, 'NumberOfSeriesRelatedInstances'),
|
||||
'SOP_IUID': safe_get_attr(instance, 'SOPInstanceUID') if instance else ''
|
||||
}
|
||||
|
||||
study_log['Series'].append(series_info)
|
||||
|
||||
# STEP 4: Send study_log to HIS API
|
||||
his_url = f"http://{settings.HIS_HOST}{settings.HIS_URL}"
|
||||
try:
|
||||
headers = {
|
||||
'id': 'Vmtaa2MySnRUblJTYWtKb1ZucHNNVlZVU2pSaFIwNTBZa1JDYkZaV1NtOWFSV1JIVmxkSmQxSnJUbFpTVlZwRlZsaGpPVkJSUFQwPQ==',
|
||||
'Content-Type': 'application/json'
|
||||
}
|
||||
response = requests.post(his_url, json=study_log, headers=headers)
|
||||
|
||||
# Add response data to the log
|
||||
study_log['HisApiResponse'] = {
|
||||
'StatusCode': response.status_code,
|
||||
'ResponseText': response.text,
|
||||
'Success': False,
|
||||
'Timestamp': datetime.now().strftime('%Y-%m-%d %H:%M:%S')
|
||||
}
|
||||
|
||||
# Safer JSON parsing
|
||||
try:
|
||||
response_data = response.json() if response.content else {}
|
||||
study_log['HisApiResponse']['ResponseData'] = response_data
|
||||
|
||||
if response.status_code == 200 and response_data.get('OK') == "1":
|
||||
study_log['HisApiResponse']['Success'] = True
|
||||
logger.info(f"Successfully sent JSON {accession_number} to HIS API")
|
||||
return {'success': True, 'study_log': study_log, 'his_success': True}
|
||||
else:
|
||||
error_msg = response_data.get('message', 'Unknown error')
|
||||
logger.error(f"Failed to send JSON for {accession_number} to HIS API: {error_msg}. Study_IUID: {study_uid}")
|
||||
return {'success': True, 'study_log': study_log, 'his_success': False}
|
||||
except ValueError:
|
||||
study_log['HisApiResponse']['ParseError'] = "Invalid JSON response"
|
||||
logger.error(f"Failed to parse response for {accession_number}, invalid JSON response. Status code: {response.status_code}")
|
||||
return {'success': True, 'study_log': study_log, 'his_success': False}
|
||||
|
||||
except Exception as e:
|
||||
study_log['HisApiResponse'] = {
|
||||
'Success': False,
|
||||
'Error': str(e),
|
||||
'Timestamp': datetime.now().strftime('%Y-%m-%d %H:%M:%S')
|
||||
}
|
||||
logger.error(f"Error sending study for {accession_number} to HIS API: {str(e)}")
|
||||
return {'success': True, 'study_log': study_log, 'his_success': False, 'error': str(e)}
|
||||
|
||||
def process_workflow(args):
|
||||
"""
|
||||
Process the full workflow: find studies by date range, retrieve them, and send to destination PACS.
|
||||
@@ -387,6 +537,7 @@ def process_workflow(args):
|
||||
|
||||
# Create directory for logs
|
||||
create_directory_if_not_exists(log_dir)
|
||||
create_directory_if_not_exists("logs")
|
||||
|
||||
# STEP 1: Find studies in the date range
|
||||
try:
|
||||
@@ -406,12 +557,30 @@ def process_workflow(args):
|
||||
save_json_data(studies_summary, f"studies_{start_date}_to_{end_date}.json", log_dir)
|
||||
|
||||
# STEP 2, 3, 4: For each study, retrieve, send, and log details
|
||||
his_log_filename = f"sendtohis_{start_date}_{end_date}.json"
|
||||
his_log_path = os.path.join("logs", his_log_filename)
|
||||
his_log = []
|
||||
his_fail_log_filename = f"fail_sendtohis_{start_date}_{end_date}.json"
|
||||
his_fail_log_path = os.path.join("logs", his_fail_log_filename)
|
||||
his_fail_log = []
|
||||
his_log_filename = f"sendtohis_{start_date}_{end_date}.json"
|
||||
his_fail_log_filename = f"fail_sendtohis_{start_date}_{end_date}.json"
|
||||
|
||||
# Register signal handler for SIGINT
|
||||
original_sigint_handler = signal.getsignal(signal.SIGINT)
|
||||
|
||||
def sigint_handler(sig, frame):
|
||||
logger.warning("Process interrupted by user. Saving logs before exiting...")
|
||||
# Save HIS logs
|
||||
if his_log:
|
||||
save_json_data(his_log, his_log_filename, "logs")
|
||||
logger.info(f"Saved {len(his_log)} successful logs to {his_log_filename}")
|
||||
if his_fail_log:
|
||||
save_json_data(his_fail_log, his_fail_log_filename, "logs")
|
||||
logger.info(f"Saved {len(his_fail_log)} failed logs to {his_fail_log_filename}")
|
||||
# Restore original signal handler and raise KeyboardInterrupt
|
||||
signal.signal(signal.SIGINT, original_sigint_handler)
|
||||
sys.exit(1)
|
||||
|
||||
# Set up our custom signal handler
|
||||
signal.signal(signal.SIGINT, sigint_handler)
|
||||
|
||||
|
||||
for i, study in enumerate(studies):
|
||||
accession_number = study.AccessionNumber
|
||||
@@ -424,77 +593,35 @@ def process_workflow(args):
|
||||
logger.info(f"Skipping study {study_uid} - log file already exists")
|
||||
continue
|
||||
|
||||
# STEP 2: Retrieve the study
|
||||
try:
|
||||
retrieve_result = retriever.retrieve_study(study_uid, accession_number=accession_number)
|
||||
if not retrieve_result['success']:
|
||||
logger.error(f"Failed to retrieve study {study_uid}: {retrieve_result['status']}")
|
||||
result = process_single_study(study_uid, accession_number, log_dir)
|
||||
|
||||
if not result['success']:
|
||||
logger.error(f"Failed to process study {study_uid}: {result.get('error', 'Unknown error')}")
|
||||
continue
|
||||
|
||||
logger.info(f"Retrieved {retrieve_result['successful_instances']} instances for study {study_uid}")
|
||||
# Record results for HIS logs
|
||||
if result.get('his_success', False):
|
||||
his_log.append(result['study_log'])
|
||||
else:
|
||||
his_fail_log.append(result['study_log'])
|
||||
|
||||
# STEP 3: Send the study to destination PACS
|
||||
send_result = sender.send_study(os.path.join(settings.DICOM_STORE_DIR, study_uid))
|
||||
if not send_result['success']:
|
||||
logger.error(f"Failed to send study {study_uid}: {send_result.get('error', 'Unknown error')}")
|
||||
|
||||
logger.info(f"Sent {send_result['successful_sends']} of {send_result['total_files']} files to destination PACS")
|
||||
|
||||
# STEP 4: Find all series and create detailed logs
|
||||
series_list = finder.find_series_for_study(study_uid, accession_number=accession_number)
|
||||
|
||||
study_date = getattr(study, 'StudyDate', '')
|
||||
study_time = getattr(study, 'StudyTime', '000000') # Default to midnight if StudyTime is not available
|
||||
study_datetime = f"{study_date}{study_time}"
|
||||
|
||||
study_log = {
|
||||
'Study_IUID': study_uid,
|
||||
'AccessionNumber': getattr(study, 'AccessionNumber', ''),
|
||||
'PatientID': getattr(study, 'PatientID', ''), # MedrecID
|
||||
'StudyDescription': getattr(study, 'StudyDescription', ''),
|
||||
'StudyDateTime': study_datetime,
|
||||
'CstoreSuccess': send_result['success'],
|
||||
'Series': []
|
||||
}
|
||||
|
||||
for series in series_list:
|
||||
series_uid = series.SeriesInstanceUID
|
||||
# Save progress incrementally every 5 studies
|
||||
if (i + 1) % 5 == 0:
|
||||
if his_log:
|
||||
save_json_data(his_log, his_log_filename, "logs")
|
||||
if his_fail_log:
|
||||
save_json_data(his_fail_log, his_fail_log_filename, "logs")
|
||||
logger.info(f"Saved progress after processing {i+1} studies")
|
||||
|
||||
# Get first instance for the series
|
||||
instance = finder.find_first_instance_for_series(study_uid, series_uid)
|
||||
|
||||
series_info = {
|
||||
'Series_IUID': getattr(series, 'SeriesInstanceUID', ''),
|
||||
'SeriesNumber': getattr(series, 'SeriesNumber', ''),
|
||||
'SeriesDescription': getattr(series, 'SeriesDescription', ''),
|
||||
'NumberOfInstances': getattr(series, 'NumberOfSeriesRelatedInstances', ''),
|
||||
'SOP_IUID': getattr(instance, 'SOPInstanceUID', '') if instance else ''
|
||||
}
|
||||
|
||||
study_log['Series'].append(series_info)
|
||||
|
||||
# Save the detailed log
|
||||
# save_json_data(study_log, f"{study_uid}.json", log_dir)
|
||||
# logger.info(f"Created detailed log for study {study_uid}")
|
||||
|
||||
# STEP 5: Send study_log to HIS API
|
||||
his_url = f"http://{settings.HIS_HOST}{settings.HIS_URL}"
|
||||
try:
|
||||
response = requests.post(his_url, json=study_log)
|
||||
if response.status_code == 200 and response.json().get('status') == "OK":
|
||||
his_log.append(study_log)
|
||||
logger.info(f"Successfully sent JSON {accession_number} to HIS API")
|
||||
else:
|
||||
his_fail_log.append(study_log)
|
||||
logger.error(f"Failed to send JSON for {accession_number} to HIS API: {response.msg}. Study_IUID: {study_uid}")
|
||||
except Exception as e:
|
||||
logger.error(f"Error sending study for {accession_number} to HIS API: {str(e)}")
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Error processing study {accession_number}: {str(e)}")
|
||||
continue
|
||||
|
||||
# Save HIS log
|
||||
# Restore original signal handler
|
||||
signal.signal(signal.SIGINT, original_sigint_handler)
|
||||
|
||||
# Final Save HIS logs
|
||||
if his_log:
|
||||
save_json_data(his_log, his_log_filename, "logs")
|
||||
if his_fail_log:
|
||||
@@ -506,6 +633,77 @@ def process_workflow(args):
|
||||
logger.error(f"Error during workflow processing: {str(e)}")
|
||||
sys.exit(1)
|
||||
|
||||
def process_workflow_by_study(args):
|
||||
"""
|
||||
Process the full workflow for a specific study.
|
||||
|
||||
Args:
|
||||
args: Command line arguments
|
||||
"""
|
||||
study_uid = args.study_uid
|
||||
log_dir = args.log_dir or settings.JSON_OUTPUT_DIR
|
||||
|
||||
logger.info(f"Starting full workflow process for study: {study_uid}")
|
||||
|
||||
# Create directory for logs
|
||||
create_directory_if_not_exists(log_dir)
|
||||
create_directory_if_not_exists("logs")
|
||||
|
||||
# Register signal handler for SIGINT
|
||||
original_sigint_handler = signal.getsignal(signal.SIGINT)
|
||||
|
||||
# Create empty containers for logs
|
||||
his_log = []
|
||||
his_fail_log = []
|
||||
his_log_filename = f"sendtohis_study_{study_uid}.json"
|
||||
his_fail_log_filename = f"fail_sendtohis_study_{study_uid}.json"
|
||||
|
||||
def sigint_handler(sig, frame):
|
||||
logger.warning("Process interrupted by user. Saving logs before exiting...")
|
||||
# Save individual study log
|
||||
if 'result' in locals() and result.get('success', False):
|
||||
save_json_data(result['study_log'], f"{study_uid}.json", log_dir)
|
||||
|
||||
# Save HIS logs
|
||||
if result.get('his_success', False):
|
||||
save_json_data([result['study_log']], his_log_filename, "logs")
|
||||
logger.info(f"Saved successful log to {his_log_filename}")
|
||||
else:
|
||||
save_json_data([result['study_log']], his_fail_log_filename, "logs")
|
||||
logger.info(f"Saved failed log to {his_fail_log_filename}")
|
||||
|
||||
# Restore original signal handler and exit
|
||||
signal.signal(signal.SIGINT, original_sigint_handler)
|
||||
sys.exit(1)
|
||||
|
||||
# Set up our custom signal handler
|
||||
signal.signal(signal.SIGINT, sigint_handler)
|
||||
|
||||
try:
|
||||
result = process_single_study(study_uid, log_dir=log_dir)
|
||||
|
||||
if not result['success']:
|
||||
logger.error(f"Failed to process study {study_uid}: {result.get('error', 'Unknown error')}")
|
||||
sys.exit(1)
|
||||
|
||||
# Save individual study log
|
||||
save_json_data(result['study_log'], f"{study_uid}.json", log_dir)
|
||||
|
||||
# Save logs
|
||||
if result.get('his_success', False):
|
||||
save_json_data([result['study_log']], his_log_filename, "logs")
|
||||
else:
|
||||
save_json_data([result['study_log']], his_fail_log_filename, "logs")
|
||||
|
||||
logger.info(f"Completed processing study: {study_uid}")
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Error during study processing: {str(e)}")
|
||||
sys.exit(1)
|
||||
finally:
|
||||
# Restore original signal handler
|
||||
signal.signal(signal.SIGINT, original_sigint_handler)
|
||||
|
||||
def main():
|
||||
"""Main function."""
|
||||
# Register cleanup handlers for graceful exit
|
||||
@@ -544,6 +742,8 @@ def main():
|
||||
send_file(args)
|
||||
elif args.command == 'process':
|
||||
process_workflow(args)
|
||||
elif args.command == 'process-study':
|
||||
process_workflow_by_study(args)
|
||||
else:
|
||||
logger.error("No command specified. Use --help for options.")
|
||||
sys.exit(1)
|
||||
|
||||
Reference in New Issue
Block a user