Merge branch 'master' of https://gitea.hmac.kr/kimminsung/fletimageanalysis

# Conflicts:
#	merge_excel_files.py
#	requirements-cli.txt

merge_excel_files.py

@@ -12,8 +12,10 @@ def merge_excel_files(input_directory, output_filename="merged_output.xlsx"):
         input_directory (str): The path to the directory containing the Excel files.
         output_filename (str): The name of the output merged Excel file.
     """
+
     excel_files = glob.glob(os.path.join(input_directory, "**/*.xlsx"), recursive=True)
 
+
     if not excel_files:
         print(f"No .xlsx files found in '{input_directory}'.")
         return

requirements-cli.txt

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 annotated-types==0.7.0
 anyio==4.9.0
 cachetools==5.5.2
@@ -35,3 +36,14 @@ typing_extensions==4.14.1
 tzdata==2025.2
 urllib3==2.5.0
 websockets==15.0.1
+=======
+# Essential packages for CLI batch processing only
+PyMuPDF>=1.26.3
+google-genai>=1.0.0
+Pillow>=10.0.0
+ezdxf>=1.4.2
+numpy>=1.24.0
+python-dotenv>=1.0.0
+pandas>=2.0.0
+requests>=2.31.0 
+>>>>>>> 3fc100697fd600ec60682e2b9a25076c8a0012db