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

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

.gitignore

@@ -30,7 +30,7 @@ share/python-wheels/
 .installed.cfg
 *.egg
 MANIFEST
-
+venv/
 # PyInstaller
 #  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.

merge_excel_files.py

@@ -12,7 +12,9 @@ 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"))
+
+    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}'.")

requirements-cli.txt

@@ -1,3 +1,42 @@
+<<<<<<< HEAD
+annotated-types==0.7.0
+anyio==4.9.0
+cachetools==5.5.2
+certifi==2025.7.14
+charset-normalizer==3.4.2
+et_xmlfile==2.0.0
+ezdxf==1.4.2
+fonttools==4.59.0
+google-auth==2.40.3
+google-genai==1.26.0
+h11==0.16.0
+httpcore==1.0.9
+httpx==0.28.1
+idna==3.10
+numpy==2.3.1
+openpyxl==3.1.5
+pandas==2.3.1
+pillow==11.3.0
+pyasn1==0.6.1
+pyasn1_modules==0.4.2
+pydantic==2.11.7
+pydantic_core==2.33.2
+PyMuPDF==1.26.3
+pyparsing==3.2.3
+python-dateutil==2.9.0.post0
+python-dotenv==1.1.1
+pytz==2025.2
+requests==2.32.4
+rsa==4.9.1
+six==1.17.0
+sniffio==1.3.1
+tenacity==8.5.0
+typing-inspection==0.4.1
+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
@@ -6,4 +45,5 @@ ezdxf>=1.4.2
 numpy>=1.24.0
 python-dotenv>=1.0.0
 pandas>=2.0.0
-requests>=2.31.0 
+requests>=2.31.0 
+>>>>>>> 3fc100697fd600ec60682e2b9a25076c8a0012db