cli-test-framework 0.3.3__tar.gz → 0.3.4__tar.gz

{cli_test_framework-0.3.3/src/cli_test_framework.egg-info → cli_test_framework-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cli-test-framework
-Version: 0.3.3
+Version: 0.3.4
 Summary: A powerful command line testing framework in Python with setup modules, parallel execution, and file comparison capabilities.
 Home-page: https://github.com/ozil111/cli-test-framework
 Author: Xiaotong Wang
@@ -18,8 +18,9 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 Requires-Dist: dukpy==0.5.0
-Requires-Dist: h5py>=3.8.0
-Requires-Dist: numpy>=2.0.1
+Requires-Dist: h5py>=3.10.0
+Requires-Dist: numpy<2.0.0,>=1.24.0
+Requires-Dist: PyYAML>=6.0
 Requires-Dist: setuptools>=75.8.0
 Requires-Dist: wheel>=0.45.1
 Dynamic: author
@@ -60,7 +61,7 @@ This is a lightweight and extensible automated testing framework that supports d
 
 ```bash
 pip install cli-test-framework
-Python >= 3.6
+Python >= 3.9
 ```
 
 ### Sequential Execution
@@ -214,12 +215,25 @@ compare-files data1.json data2.json \
 ```
 
 #### HDF5 Comparison
+
+**New Feature**: HDF5 group path expansion! By default, when you specify a group path in `--h5-table`, the comparator will automatically expand and compare all datasets and subgroups within that path.
+
 ```bash
+# Compare specific tables/groups with auto-expansion (default behavior)
 compare-files data1.h5 data2.h5 \
-    --h5-table table1,table2 \
-    --h5-structure-only \
+    --h5-table group1/subgroupA \
     --h5-rtol 1e-5 \
     --h5-atol 1e-8
+
+# Disable auto-expansion to compare only the specified path itself
+compare-files data1.h5 data2.h5 \
+    --h5-table group1 \
+    --h5-no-expand-path
+
+# Use regex patterns (also supports auto-expansion)
+compare-files data1.h5 data2.h5 \
+    --h5-table-regex "group1/.*" \
+    --h5-structure-only
 ```
 
 #### Binary Comparison

{cli_test_framework-0.3.3 → cli_test_framework-0.3.4}/README.md

@@ -25,7 +25,7 @@ This is a lightweight and extensible automated testing framework that supports d
 
 ```bash
 pip install cli-test-framework
-Python >= 3.6
+Python >= 3.9
 ```
 
 ### Sequential Execution
@@ -179,12 +179,25 @@ compare-files data1.json data2.json \
 ```
 
 #### HDF5 Comparison
+
+**New Feature**: HDF5 group path expansion! By default, when you specify a group path in `--h5-table`, the comparator will automatically expand and compare all datasets and subgroups within that path.
+
 ```bash
+# Compare specific tables/groups with auto-expansion (default behavior)
 compare-files data1.h5 data2.h5 \
-    --h5-table table1,table2 \
-    --h5-structure-only \
+    --h5-table group1/subgroupA \
     --h5-rtol 1e-5 \
     --h5-atol 1e-8
+
+# Disable auto-expansion to compare only the specified path itself
+compare-files data1.h5 data2.h5 \
+    --h5-table group1 \
+    --h5-no-expand-path
+
+# Use regex patterns (also supports auto-expansion)
+compare-files data1.h5 data2.h5 \
+    --h5-table-regex "group1/.*" \
+    --h5-structure-only
 ```
 
 #### Binary Comparison

{cli_test_framework-0.3.3 → cli_test_framework-0.3.4}/docs/user_manual.md

@@ -27,7 +27,7 @@ The CLI Testing Framework is a powerful tool designed for testing command-line a
 ## Installation
 
 ### Prerequisites
-- Python 3.6 or higher
+- Python 3.9 or higher
 - pip package manager
 
 ### Basic Installation

{cli_test_framework-0.3.3 → cli_test_framework-0.3.4}/setup.py

@@ -8,7 +8,7 @@ with open(os.path.join(this_directory, 'README.md'), encoding='utf-8') as f:
 
 setup(
     name="cli-test-framework",
-    version="0.3.3",
+    version="0.3.4",
     author="Xiaotong Wang",
     author_email="xiaotongwang98@gmail.com",
     description="A powerful command line testing framework in Python with setup modules, parallel execution, and file comparison capabilities.",
@@ -19,8 +19,9 @@ setup(
     package_dir={"": "src"},
     install_requires=[
         "dukpy==0.5.0",
-        "h5py>=3.8.0",
-        "numpy>=2.0.1",
+        "h5py>=3.10.0",
+        "numpy>=1.24.0,<2.0.0",
+        "PyYAML>=6.0",
         "setuptools>=75.8.0",
         "wheel>=0.45.1"
     ],

{cli_test_framework-0.3.3 → cli_test_framework-0.3.4}/src/cli_test_framework/commands/compare.py

@@ -67,6 +67,8 @@ def parse_arguments():
                          help="Relative tolerance for numerical comparison in HDF5 files")
     h5_group.add_argument("--h5-atol", type=float, default=1e-8,
                          help="Absolute tolerance for numerical comparison in HDF5 files")
+    h5_group.add_argument("--h5-no-expand-path", dest="h5_expand_path", action="store_false",
+                         help="Do not expand HDF5 group paths to compare all sub-items.")
     
     return parser.parse_args()
 
@@ -148,6 +150,7 @@ def main():
             comparator_kwargs["show_content_diff"] = args.h5_show_content_diff
             comparator_kwargs["rtol"] = args.h5_rtol
             comparator_kwargs["atol"] = args.h5_atol
+            comparator_kwargs["expand_path"] = args.h5_expand_path
         
         if file_type == "binary":
             comparator_kwargs["similarity"] = args.similarity

{cli_test_framework-0.3.3 → cli_test_framework-0.3.4}/src/cli_test_framework/file_comparator/factory.py

@@ -65,7 +65,7 @@ class ComparatorFactory:
         if file_type.lower() == 'h5':
             # H5 comparator accepts specific parameters
             h5_kwargs = {k: v for k, v in kwargs.items()
-                        if k in ['tables', 'table_regex', 'encoding', 'chunk_size', 'verbose', 'structure_only', 'show_content_diff', 'debug', 'rtol', 'atol']}
+                        if k in ['tables', 'table_regex', 'encoding', 'chunk_size', 'verbose', 'structure_only', 'show_content_diff', 'debug', 'rtol', 'atol', 'expand_path']}
             return comparator_class(**h5_kwargs)
         elif file_type.lower() == 'binary':
             # Binary comparator accepts all parameters, including num_threads

{cli_test_framework-0.3.3 → cli_test_framework-0.3.4}/src/cli_test_framework/file_comparator/h5_comparator.py

@@ -5,7 +5,7 @@ import logging
 import re
 
 class H5Comparator(BaseComparator):
-    def __init__(self, tables=None, table_regex=None, structure_only=False, show_content_diff=False, debug=False, rtol=1e-5, atol=1e-8, **kwargs):
+    def __init__(self, tables=None, table_regex=None, structure_only=False, show_content_diff=False, debug=False, rtol=1e-5, atol=1e-8, expand_path=True, **kwargs):
         """
         Initialize H5 comparator
         :param tables: List of table names to compare. If None, compare all tables
@@ -15,6 +15,7 @@ class H5Comparator(BaseComparator):
         :param debug: If True, enable debug mode
         :param rtol: Relative tolerance for numerical comparison
         :param atol: Absolute tolerance for numerical comparison
+        :param expand_path: If True, expand group paths to compare all sub-items. Defaults to True.
         """
         super().__init__(**kwargs)
         self.tables = tables
@@ -23,18 +24,20 @@ class H5Comparator(BaseComparator):
         self.show_content_diff = show_content_diff
         self.rtol = rtol
         self.atol = atol
+        self.expand_path = expand_path
         
         # Set debug level if verbose is enabled
         if kwargs.get('verbose', False) or debug:
             self.logger.setLevel(logging.DEBUG)
             
-        self.logger.debug(f"Initialized H5Comparator with structure_only={structure_only}, show_content_diff={show_content_diff}, rtol={rtol}, atol={atol}")
+        self.logger.debug(f"Initialized H5Comparator with structure_only={structure_only}, show_content_diff={show_content_diff}, rtol={rtol}, atol={atol}, expand_path={expand_path}")
         if table_regex:
             self.logger.debug(f"Using table regex pattern: {table_regex}")
 
     def read_content(self, file_path, start_line=0, end_line=None, start_column=0, end_column=None):
         """Read H5 file content"""
         content = {}
+        processed_paths = set()
         
         # Log whether we're in structure-only mode
         self.logger.debug(f"Reading file {file_path} in structure-only mode: {self.structure_only}")
@@ -44,6 +47,10 @@ class H5Comparator(BaseComparator):
         with h5py.File(file_path, 'r') as f:
             # Function to collect structure information
             def collect_structure(name, obj):
+                if name in processed_paths:
+                    self.logger.debug(f"Path {name} already processed, skipping.")
+                    return
+
                 if isinstance(obj, h5py.Dataset):
                     content[name] = {
                         'type': 'dataset',
@@ -52,6 +59,7 @@ class H5Comparator(BaseComparator):
                         'attrs': dict(obj.attrs)
                     }
                     self.logger.debug(f"Collected structure for dataset: {name}")
+                    processed_paths.add(name)
                 elif isinstance(obj, h5py.Group) and name:  # Skip root group
                     content[name] = {
                         'type': 'group',
@@ -59,9 +67,14 @@ class H5Comparator(BaseComparator):
                         'attrs': dict(obj.attrs)
                     }
                     self.logger.debug(f"Collected structure for group: {name}")
+                    processed_paths.add(name)
             
             # Function to collect structure and data
             def collect_structure_and_data(name, obj):
+                if name in processed_paths:
+                    self.logger.debug(f"Path {name} already processed, skipping.")
+                    return
+
                 if isinstance(obj, h5py.Dataset):
                     dataset_info = {
                         'type': 'dataset',
@@ -94,6 +107,7 @@ class H5Comparator(BaseComparator):
                         self.logger.error(f"Error reading data from {name}: {str(e)}")
                     
                     content[name] = dataset_info
+                    processed_paths.add(name)
                     
                 elif isinstance(obj, h5py.Group) and name:  # Skip root group
                     content[name] = {
@@ -102,6 +116,7 @@ class H5Comparator(BaseComparator):
                         'attrs': dict(obj.attrs)
                     }
                     self.logger.debug(f"Collected structure for group: {name}")
+                    processed_paths.add(name)
             
             if self.tables or self.table_regex:
                 # If specific tables or regex pattern is specified
@@ -134,10 +149,26 @@ class H5Comparator(BaseComparator):
                 
                 def process_item(name, item):
                     try:
+                        # Process the current item first
                         if self.structure_only:
                             collect_structure(name, item)
                         else:
                             collect_structure_and_data(name, item)
+
+                        # If it's a group and expand_path is enabled, visit all its members
+                        if self.expand_path and isinstance(item, h5py.Group):
+                            self.logger.debug(f"Expanding group path: {name}")
+                            
+                            def visitor(sub_name, sub_obj):
+                                full_path = f"{name}/{sub_name}"
+                                self.logger.debug(f"Processing sub-item from expansion: {full_path}")
+                                if self.structure_only:
+                                    collect_structure(full_path, sub_obj)
+                                else:
+                                    collect_structure_and_data(full_path, sub_obj)
+                            
+                            item.visititems(visitor)
+
                     except Exception as e:
                         self.logger.error(f"Error processing {name}: {str(e)}")
                 

{cli_test_framework-0.3.3 → cli_test_framework-0.3.4/src/cli_test_framework.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cli-test-framework
-Version: 0.3.3
+Version: 0.3.4
 Summary: A powerful command line testing framework in Python with setup modules, parallel execution, and file comparison capabilities.
 Home-page: https://github.com/ozil111/cli-test-framework
 Author: Xiaotong Wang
@@ -18,8 +18,9 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 Requires-Dist: dukpy==0.5.0
-Requires-Dist: h5py>=3.8.0
-Requires-Dist: numpy>=2.0.1
+Requires-Dist: h5py>=3.10.0
+Requires-Dist: numpy<2.0.0,>=1.24.0
+Requires-Dist: PyYAML>=6.0
 Requires-Dist: setuptools>=75.8.0
 Requires-Dist: wheel>=0.45.1
 Dynamic: author
@@ -60,7 +61,7 @@ This is a lightweight and extensible automated testing framework that supports d
 
 ```bash
 pip install cli-test-framework
-Python >= 3.6
+Python >= 3.9
 ```
 
 ### Sequential Execution
@@ -214,12 +215,25 @@ compare-files data1.json data2.json \
 ```
 
 #### HDF5 Comparison
+
+**New Feature**: HDF5 group path expansion! By default, when you specify a group path in `--h5-table`, the comparator will automatically expand and compare all datasets and subgroups within that path.
+
 ```bash
+# Compare specific tables/groups with auto-expansion (default behavior)
 compare-files data1.h5 data2.h5 \
-    --h5-table table1,table2 \
-    --h5-structure-only \
+    --h5-table group1/subgroupA \
     --h5-rtol 1e-5 \
     --h5-atol 1e-8
+
+# Disable auto-expansion to compare only the specified path itself
+compare-files data1.h5 data2.h5 \
+    --h5-table group1 \
+    --h5-no-expand-path
+
+# Use regex patterns (also supports auto-expansion)
+compare-files data1.h5 data2.h5 \
+    --h5-table-regex "group1/.*" \
+    --h5-structure-only
 ```
 
 #### Binary Comparison

{cli_test_framework-0.3.3 → cli_test_framework-0.3.4}/src/cli_test_framework.egg-info/requires.txt

@@ -1,5 +1,6 @@
 dukpy==0.5.0
-h5py>=3.8.0
-numpy>=2.0.1
+h5py>=3.10.0
+numpy<2.0.0,>=1.24.0
+PyYAML>=6.0
 setuptools>=75.8.0
 wheel>=0.45.1