pyopenapi-gen 0.15.0__tar.gz → 0.16.1__tar.gz

{pyopenapi_gen-0.15.0 → pyopenapi_gen-0.16.1}/.github/workflows/semantic-release.yml

@@ -97,6 +97,33 @@ jobs:
         git config user.email "github-actions[bot]@users.noreply.github.com"
         poetry run semantic-release version --skip-build
 
+    - name: Sync version to __init__.py
+      if: steps.check_changes.outputs.release_worthy > 0 || github.event_name == 'workflow_dispatch'
+      env:
+        GH_TOKEN: ${{ secrets.SEMANTIC_RELEASE_TOKEN || secrets.GITHUB_TOKEN }}
+      run: |
+        echo "🔄 Syncing version from pyproject.toml to __init__.py..."
+
+        # Fetch latest to ensure we have the semantic-release commit
+        git fetch origin main
+        git reset --hard origin/main
+
+        # Run sync script
+        poetry run python scripts/sync_version_to_init.py
+
+        # Check if __init__.py was modified
+        if git diff --quiet src/pyopenapi_gen/__init__.py; then
+          echo "✅ __init__.py already in sync, no changes needed"
+        else
+          echo "📝 __init__.py was updated, creating follow-up commit..."
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add src/pyopenapi_gen/__init__.py
+          git commit -m "chore(release): sync __init__.py version [skip ci]"
+          git push origin main
+          echo "✅ Version sync complete and committed"
+        fi
+
     - name: Build packages after version bump
       if: steps.check_changes.outputs.release_worthy > 0 || github.event_name == 'workflow_dispatch'
       run: |

{pyopenapi_gen-0.15.0 → pyopenapi_gen-0.16.1}/CHANGELOG.md

@@ -1,6 +1,128 @@
 # CHANGELOG
 
 
+## v0.16.1 (2025-10-13)
+
+### Bug Fixes
+
+- **version**: Manually sync __init__.py to 0.16.0 after failed workflow
+  ([`7ee9090`](https://github.com/mindhiveoy/pyopenapi_gen/commit/7ee90902add14d93d471418b56514a8bcafd81cb))
+
+The semantic-release workflow successfully created version 0.16.0 but failed when trying to push the
+  __init__.py sync due to the force-with-lease issue.
+
+This commit manually syncs __init__.py to 0.16.0 to match pyproject.toml. Future releases will use
+  the new workflow logic with follow-up commits.
+
+- **workflow**: Use follow-up commit instead of amending for version sync
+  ([`96f2014`](https://github.com/mindhiveoy/pyopenapi_gen/commit/96f2014bb10ecbfbe3873db32ea6a5f8334542a2))
+
+ISSUE: The git push --force-with-lease was failing with "stale info" because: 1. semantic-release
+  creates and pushes a commit 2. Our sync script tried to amend that commit 3. force-with-lease
+  detected remote had changed and rejected the push
+
+SOLUTION: Changed strategy to use a follow-up commit instead of amending: 1. Fetch latest from
+  origin/main after semantic-release pushes 2. Reset --hard to origin/main to sync local state 3.
+  Run sync script to update __init__.py 4. If changed, create a NEW commit with [skip ci] flag 5.
+  Push normally (no force needed)
+
+Benefits: - Safer: No force-pushing required - Cleaner: Normal git flow with proper commit sequence
+  - Prevents loops: [skip ci] prevents triggering another workflow run
+
+This will result in two commits per release (semantic-release + sync) but is more reliable than
+  force-pushing.
+
+Fixes: https://github.com/mindhiveoy/pyopenapi_gen/actions/runs/18461834318
+
+
+## v0.16.0 (2025-10-13)
+
+### Bug Fixes
+
+- **api**: Improve type annotation for generate_client return type
+  ([`f35d99c`](https://github.com/mindhiveoy/pyopenapi_gen/commit/f35d99c1d2233a20fdd1a69ef0a175ab902513c4))
+
+- Change return type from List[Any] to List[Path] for better type safety - Add proper pathlib.Path
+  import to support the type annotation - Enhances IDE support and type checking for programmatic
+  API users
+
+🤖 Generated with [Claude Code](https://claude.ai/code)
+
+Co-authored-by: Ville Venäläinen <undefined@users.noreply.github.com>
+
+- **api**: Update business_swagger.json descriptions and schemas
+  ([`6496144`](https://github.com/mindhiveoy/pyopenapi_gen/commit/6496144200fb8dfb28275f0d111138107775fa29))
+
+- **lint**: Correct import ordering in __init__.py for Ruff compliance
+  ([`a159807`](https://github.com/mindhiveoy/pyopenapi_gen/commit/a159807fd1932206dd44c805629683998c88707f))
+
+- **release**: Sync __init__.py version automatically in semantic-release workflow
+  ([`7f28674`](https://github.com/mindhiveoy/pyopenapi_gen/commit/7f2867449be1b75b2fc4b7c04073fcad3320e865))
+
+ISSUE: Semantic-release was updating pyproject.toml version but leaving __init__.py at the old
+  version, causing the version validation to fail.
+
+SOLUTION: 1. Fixed immediate issue: Updated __init__.py to match pyproject.toml (0.15.0) 2. Added
+  automatic sync: Created scripts/sync_version_to_init.py to sync version from pyproject.toml to
+  __init__.py 3. Updated workflow: Added step after semantic-release version bump that runs the sync
+  script and amends the commit if __init__.py was updated
+
+This ensures all version files stay synchronized after every semantic-release run.
+
+Fixes: https://github.com/mindhiveoy/pyopenapi_gen/actions/runs/18461374998
+
+- **security**: Address Bandit security warnings with proper logging and nosec annotations
+  ([`f9b0ff3`](https://github.com/mindhiveoy/pyopenapi_gen/commit/f9b0ff3e73ebeaaed49fc631429835ee6e99a33c))
+
+Fixed all Bandit security warnings: - Replace try-except-pass with proper exception logging in
+  parser.py - Replace try-except-pass with logging in telemetry.py - Add nosec B603 annotations to
+  all subprocess.run() calls with explanations - Add nosec B404 annotation to subprocess import with
+  justification
+
+Changes: - parser.py: Log exceptions instead of silent pass for debugging - telemetry.py: Log
+  telemetry failures for debugging - postprocess_manager.py: Document all subprocess calls are safe
+  (hardcoded commands, no shell)
+
+Bandit now reports zero issues (8 properly suppressed with nosec). All quality checks pass.
+
+- **types**: Add binary format mapping to unified type resolver
+  ([`ecba081`](https://github.com/mindhiveoy/pyopenapi_gen/commit/ecba081b37a217277ea61d58b30d1f0a7ac2e04d))
+
+- Add 'binary' to format_mapping in OpenAPISchemaResolver._resolve_string() - Ensures string schemas
+  with format=binary resolve to bytes type - Adds comprehensive test coverage for binary format
+  resolution - Closes gap between legacy and unified type systems
+
+Before: string fields with format=binary were typed as str
+
+After: string fields with format=binary are correctly typed as bytes
+
+### Features
+
+- **api**: Add developer-friendly programmatic API with generate_client()
+  ([`ec8ad0c`](https://github.com/mindhiveoy/pyopenapi_gen/commit/ec8ad0c7b166e9cb523a91d97f8639f050d940c3))
+
+Add a clean, function-based API for programmatic usage alongside the existing CLI.
+
+Key additions: - generate_client() convenience function for simple library usage - Export
+  ClientGenerator and GenerationError at package level - Comprehensive documentation with examples
+  in CLAUDE.md - Full test coverage with 9 new tests in tests/api/
+
+Benefits: - Simple one-function API: generate_client(spec_path, project_root, output_package) - No
+  need to import from deep paths or understand internal structure - Proper error handling with
+  exported GenerationError exception - Fully backward compatible - all existing code continues to
+  work - Matches patterns from similar tools (openapi-python-client, datamodel-code-generator)
+
+Documentation includes: - Basic usage examples - Advanced usage with error handling - Multi-client
+  generation scripts - Build system integration examples - Complete API reference
+
+All tests pass (9 new + existing), type-safe (mypy strict), and quality checks pass.
+
+### Refactoring
+
+- **init**: Remove unused HTTPMethod enum and IR dataclasses
+  ([`7b096ed`](https://github.com/mindhiveoy/pyopenapi_gen/commit/7b096ed321612823976a2e7b7a995d0aaf024312))
+
+
 ## v0.15.0 (2025-10-11)
 
 ### Bug Fixes

{pyopenapi_gen-0.15.0 → pyopenapi_gen-0.16.1}/CLAUDE.md

@@ -605,6 +605,239 @@ pyopenapi-gen api_v2.yaml --project-root . --output-package pyapis.v2 --core-pac
 # └── v2/                # Second client
 ```
 
+## Using as a Library (Programmatic API)
+
+### Why Programmatic Usage?
+The generator was designed to work both as a CLI tool and as a Python library. Programmatic usage enables integration with build systems, CI/CD pipelines, code generators, and custom tooling. You get the same powerful code generation capabilities with full Python API access.
+
+### What Is the Programmatic API?
+A simple, function-based API that wraps the internal `ClientGenerator` class, providing a clean entry point for library usage without requiring knowledge of internal structure.
+
+### How to Use Programmatically
+
+#### Basic Usage
+```python
+from pyopenapi_gen import generate_client
+
+# Simple client generation
+files = generate_client(
+    spec_path="input/openapi.yaml",
+    project_root=".",
+    output_package="pyapis.my_client"
+)
+
+print(f"Generated {len(files)} files")
+```
+
+#### Advanced Usage with All Options
+```python
+from pyopenapi_gen import generate_client, GenerationError
+
+try:
+    files = generate_client(
+        spec_path="input/openapi.yaml",
+        project_root=".",
+        output_package="pyapis.my_client",
+        core_package="pyapis.core",  # Optional shared core
+        force=True,                   # Overwrite without diff check
+        no_postprocess=False,         # Run Black + mypy
+        verbose=True                  # Show progress
+    )
+
+    # Process generated files
+    for file_path in files:
+        print(f"Generated: {file_path}")
+
+except GenerationError as e:
+    print(f"Generation failed: {e}")
+    # Handle error appropriately
+```
+
+#### Multi-Client Generation Script
+```python
+from pyopenapi_gen import generate_client
+from pathlib import Path
+
+# Configuration for multiple clients
+clients = [
+    {
+        "spec": "api_v1.yaml",
+        "package": "pyapis.client_v1",
+    },
+    {
+        "spec": "api_v2.yaml",
+        "package": "pyapis.client_v2",
+    },
+]
+
+# Shared core package
+core_package = "pyapis.core"
+
+# Generate all clients
+for client_config in clients:
+    print(f"Generating {client_config['package']}...")
+
+    generate_client(
+        spec_path=client_config["spec"],
+        project_root=".",
+        output_package=client_config["package"],
+        core_package=core_package,
+        force=True,
+        verbose=True
+    )
+
+print("All clients generated successfully!")
+```
+
+#### Integration with Build Systems
+```python
+# Example: Custom build script
+import sys
+from pathlib import Path
+from pyopenapi_gen import generate_client, GenerationError
+
+def build_api_clients():
+    """Generate all API clients as part of build process"""
+
+    specs_dir = Path("specs")
+    output_root = Path("src/pyapis")
+
+    # Find all OpenAPI specs
+    spec_files = list(specs_dir.glob("*.yaml")) + list(specs_dir.glob("*.json"))
+
+    if not spec_files:
+        print("No OpenAPI specs found in specs/")
+        return False
+
+    # Generate clients
+    for spec_file in spec_files:
+        client_name = spec_file.stem
+        package_name = f"pyapis.{client_name}"
+
+        print(f"Generating client for {spec_file.name}...")
+
+        try:
+            generate_client(
+                spec_path=str(spec_file),
+                project_root="src",
+                output_package=package_name,
+                core_package="pyapis.core",
+                force=True
+            )
+        except GenerationError as e:
+            print(f"Failed to generate {client_name}: {e}", file=sys.stderr)
+            return False
+
+    return True
+
+if __name__ == "__main__":
+    success = build_api_clients()
+    sys.exit(0 if success else 1)
+```
+
+### API Reference
+
+#### `generate_client()` Function
+
+```python
+def generate_client(
+    spec_path: str,
+    project_root: str,
+    output_package: str,
+    core_package: str | None = None,
+    force: bool = False,
+    no_postprocess: bool = False,
+    verbose: bool = False,
+) -> List[Path]
+```
+
+**Parameters**:
+- `spec_path`: Path to OpenAPI spec file (YAML or JSON)
+- `project_root`: Root directory of your Python project
+- `output_package`: Python package name (e.g., `'pyapis.my_client'`)
+- `core_package`: Optional shared core package name (defaults to `{output_package}.core`)
+- `force`: Skip diff check and overwrite existing output
+- `no_postprocess`: Skip Black formatting and mypy type checking
+- `verbose`: Print detailed progress information
+
+**Returns**: List of `Path` objects for all generated files
+
+**Raises**: `GenerationError` if generation fails
+
+#### `ClientGenerator` Class (Advanced)
+
+For advanced use cases requiring more control:
+
+```python
+from pyopenapi_gen import ClientGenerator, GenerationError
+from pathlib import Path
+
+# Create generator with custom settings
+generator = ClientGenerator(verbose=True)
+
+# Generate with full control
+try:
+    files = generator.generate(
+        spec_path="openapi.yaml",
+        project_root=Path("."),
+        output_package="pyapis.my_client",
+        core_package="pyapis.core",
+        force=False,
+        no_postprocess=False
+    )
+except GenerationError as e:
+    print(f"Generation failed: {e}")
+```
+
+#### `GenerationError` Exception
+
+Raised when generation fails. Contains contextual information about the failure:
+
+```python
+from pyopenapi_gen import generate_client, GenerationError
+
+try:
+    generate_client(
+        spec_path="invalid.yaml",
+        project_root=".",
+        output_package="test"
+    )
+except GenerationError as e:
+    # Exception message includes context
+    print(f"Error: {e}")
+    # Typical causes:
+    # - Invalid OpenAPI specification
+    # - File I/O errors
+    # - Type checking failures
+    # - Invalid project structure
+```
+
+### Comparison: CLI vs Programmatic API
+
+**CLI Usage**:
+```bash
+pyopenapi-gen input/openapi.yaml \
+  --project-root . \
+  --output-package pyapis.my_client \
+  --force \
+  --verbose
+```
+
+**Equivalent Programmatic Usage**:
+```python
+from pyopenapi_gen import generate_client
+
+generate_client(
+    spec_path="input/openapi.yaml",
+    project_root=".",
+    output_package="pyapis.my_client",
+    force=True,
+    verbose=True
+)
+```
+
+Both approaches use the same underlying implementation and produce identical results.
+
 ## Release Management & Semantic Versioning
 
 ### Automated Release Pipeline

{pyopenapi_gen-0.15.0 → pyopenapi_gen-0.16.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyopenapi-gen
-Version: 0.15.0
+Version: 0.16.1
 Summary: Modern, async-first Python client generator for OpenAPI specifications with advanced cycle detection and unified type resolution
 Project-URL: Homepage, https://github.com/your-org/pyopenapi-gen
 Project-URL: Documentation, https://github.com/your-org/pyopenapi-gen/blob/main/README.md

{pyopenapi_gen-0.15.0 → pyopenapi_gen-0.16.1}/coverage.xml

@@ -1,32 +1,43 @@
 <?xml version="1.0" ?>
-<coverage version="7.10.7" timestamp="1760207888499" lines-valid="6318" lines-covered="5572" line-rate="0.8819" branches-covered="0" branches-valid="0" branch-rate="0" complexity="0">
+<coverage version="7.10.7" timestamp="1760349998856" lines-valid="6330" lines-covered="5585" line-rate="0.8823" branches-covered="0" branches-valid="0" branch-rate="0" complexity="0">
 	<!-- Generated by coverage.py: https://coverage.readthedocs.io/en/7.10.7 -->
 	<!-- Based on https://raw.githubusercontent.com/cobertura/web/master/htdocs/xml/coverage-04.dtd -->
 	<sources>
 		<source>/home/runner/work/pyopenapi_gen/pyopenapi_gen/src</source>
 	</sources>
 	<packages>
-		<package name="pyopenapi_gen" line-rate="0.9615" branch-rate="0" complexity="0">
+		<package name="pyopenapi_gen" line-rate="0.9641" branch-rate="0" complexity="0">
 			<classes>
 				<class name="__init__.py" filename="pyopenapi_gen/__init__.py" complexity="0" line-rate="1" branch-rate="0">
 					<methods/>
 					<lines>
 						<line number="9" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="46" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="53" hits="1"/>
+						<line number="68" hits="1"/>
+						<line number="70" hits="1"/>
+						<line number="71" hits="1"/>
+						<line number="73" hits="1"/>
+						<line number="74" hits="1"/>
+						<line number="75" hits="1"/>
+						<line number="77" hits="1"/>
+						<line number="78" hits="1"/>
+						<line number="79" hits="1"/>
+						<line number="81" hits="1"/>
+						<line number="82" hits="1"/>
+						<line number="83" hits="1"/>
+						<line number="85" hits="1"/>
+						<line number="86" hits="1"/>
+						<line number="89" hits="1"/>
+						<line number="91" hits="1"/>
 						<line number="99" hits="1"/>
-						<line number="101" hits="1"/>
-						<line number="102" hits="1"/>
-						<line number="104" hits="1"/>
-						<line number="105" hits="1"/>
-						<line number="106" hits="1"/>
-						<line number="108" hits="1"/>
-						<line number="109" hits="1"/>
-						<line number="112" hits="1"/>
-						<line number="114" hits="1"/>
+						<line number="213" hits="1"/>
+						<line number="215" hits="1"/>
+						<line number="216" hits="1"/>
 					</lines>
 				</class>
 				<class name="__main__.py" filename="pyopenapi_gen/__main__.py" complexity="0" line-rate="0" branch-rate="0">
@@ -641,7 +652,7 @@
 				</class>
 			</classes>
 		</package>
-		<package name="pyopenapi_gen.core" line-rate="0.8315" branch-rate="0" complexity="0">
+		<package name="pyopenapi_gen.core" line-rate="0.8318" branch-rate="0" complexity="0">
 			<classes>
 				<class name="__init__.py" filename="pyopenapi_gen/core/__init__.py" complexity="0" line-rate="1" branch-rate="0">
 					<methods/>
@@ -1039,6 +1050,7 @@
 						<line number="64" hits="1"/>
 						<line number="65" hits="1"/>
 						<line number="67" hits="1"/>
+						<line number="69" hits="1"/>
 					</lines>
 				</class>
 				<class name="utils.py" filename="pyopenapi_gen/core/utils.py" complexity="0" line-rate="0.9341" branch-rate="0">
@@ -1833,7 +1845,7 @@
 				</class>
 			</classes>
 		</package>
-		<package name="pyopenapi_gen.core.parsing" line-rate="0.9167" branch-rate="0" complexity="0">
+		<package name="pyopenapi_gen.core.parsing" line-rate="0.9184" branch-rate="0" complexity="0">
 			<classes>
 				<class name="__init__.py" filename="pyopenapi_gen/core/parsing/__init__.py" complexity="0" line-rate="1" branch-rate="0">
 					<methods/>
@@ -2043,7 +2055,7 @@
 						<line number="169" hits="1"/>
 					</lines>
 				</class>
-				<class name="schema_parser.py" filename="pyopenapi_gen/core/parsing/schema_parser.py" complexity="0" line-rate="0.8902" branch-rate="0">
+				<class name="schema_parser.py" filename="pyopenapi_gen/core/parsing/schema_parser.py" complexity="0" line-rate="0.8939" branch-rate="0">
 					<methods/>
 					<lines>
 						<line number="5" hits="1"/>
@@ -2128,7 +2140,7 @@
 						<line number="266" hits="1"/>
 						<line number="267" hits="1"/>
 						<line number="268" hits="1"/>
-						<line number="269" hits="0"/>
+						<line number="269" hits="1"/>
 						<line number="270" hits="1"/>
 						<line number="271" hits="0"/>
 						<line number="272" hits="0"/>
@@ -5431,28 +5443,27 @@
 						<line number="280" hits="1"/>
 						<line number="281" hits="1"/>
 						<line number="282" hits="1"/>
-						<line number="294" hits="1"/>
-						<line number="297" hits="1"/>
+						<line number="295" hits="1"/>
 						<line number="298" hits="1"/>
 						<line number="299" hits="1"/>
 						<line number="300" hits="1"/>
 						<line number="301" hits="1"/>
-						<line number="302" hits="0"/>
-						<line number="303" hits="1"/>
+						<line number="302" hits="1"/>
+						<line number="303" hits="0"/>
 						<line number="304" hits="1"/>
-						<line number="306" hits="1"/>
-						<line number="308" hits="1"/>
-						<line number="310" hits="1"/>
-						<line number="312" hits="1"/>
-						<line number="314" hits="1"/>
-						<line number="316" hits="1"/>
-						<line number="318" hits="1"/>
-						<line number="320" hits="1"/>
-						<line number="322" hits="1"/>
-						<line number="328" hits="1"/>
+						<line number="305" hits="1"/>
+						<line number="307" hits="1"/>
+						<line number="309" hits="1"/>
+						<line number="311" hits="1"/>
+						<line number="313" hits="1"/>
+						<line number="315" hits="1"/>
+						<line number="317" hits="1"/>
+						<line number="319" hits="1"/>
+						<line number="321" hits="1"/>
+						<line number="323" hits="1"/>
 						<line number="329" hits="1"/>
-						<line number="331" hits="1"/>
-						<line number="335" hits="1"/>
+						<line number="330" hits="1"/>
+						<line number="332" hits="1"/>
 						<line number="336" hits="1"/>
 						<line number="337" hits="1"/>
 						<line number="338" hits="1"/>
@@ -5462,67 +5473,68 @@
 						<line number="342" hits="1"/>
 						<line number="343" hits="1"/>
 						<line number="344" hits="1"/>
-						<line number="348" hits="1"/>
-						<line number="354" hits="1"/>
-						<line number="357" hits="1"/>
-						<line number="360" hits="1"/>
+						<line number="345" hits="1"/>
+						<line number="349" hits="1"/>
+						<line number="355" hits="1"/>
+						<line number="358" hits="1"/>
 						<line number="361" hits="1"/>
-						<line number="362" hits="0"/>
-						<line number="364" hits="1"/>
-						<line number="366" hits="1"/>
-						<line number="368" hits="1"/>
-						<line number="370" hits="1"/>
-						<line number="372" hits="1"/>
+						<line number="362" hits="1"/>
+						<line number="363" hits="0"/>
+						<line number="365" hits="1"/>
+						<line number="367" hits="1"/>
+						<line number="369" hits="1"/>
+						<line number="371" hits="1"/>
 						<line number="373" hits="1"/>
 						<line number="374" hits="1"/>
-						<line number="377" hits="1"/>
+						<line number="375" hits="1"/>
 						<line number="378" hits="1"/>
 						<line number="379" hits="1"/>
 						<line number="380" hits="1"/>
-						<line number="382" hits="1"/>
-						<line number="384" hits="1"/>
+						<line number="381" hits="1"/>
+						<line number="383" hits="1"/>
 						<line number="385" hits="1"/>
-						<line number="387" hits="1"/>
-						<line number="391" hits="1"/>
-						<line number="392" hits="0"/>
-						<line number="394" hits="1"/>
+						<line number="386" hits="1"/>
+						<line number="388" hits="1"/>
+						<line number="392" hits="1"/>
+						<line number="393" hits="0"/>
 						<line number="395" hits="1"/>
-						<line number="397" hits="1"/>
-						<line number="403" hits="1"/>
-						<line number="407" hits="1"/>
+						<line number="396" hits="1"/>
+						<line number="398" hits="1"/>
+						<line number="404" hits="1"/>
 						<line number="408" hits="1"/>
-						<line number="409" hits="0"/>
-						<line number="410" hits="1"/>
-						<line number="412" hits="1"/>
+						<line number="409" hits="1"/>
+						<line number="410" hits="0"/>
+						<line number="411" hits="1"/>
 						<line number="413" hits="1"/>
-						<line number="416" hits="1"/>
+						<line number="414" hits="1"/>
 						<line number="417" hits="1"/>
 						<line number="418" hits="1"/>
-						<line number="420" hits="1"/>
-						<line number="422" hits="1"/>
-						<line number="428" hits="1"/>
-						<line number="429" hits="0"/>
-						<line number="432" hits="1"/>
+						<line number="419" hits="1"/>
+						<line number="421" hits="1"/>
+						<line number="423" hits="1"/>
+						<line number="429" hits="1"/>
+						<line number="430" hits="0"/>
 						<line number="433" hits="1"/>
 						<line number="434" hits="1"/>
-						<line number="438" hits="1"/>
-						<line number="440" hits="1"/>
-						<line number="444" hits="1"/>
-						<line number="445" hits="0"/>
-						<line number="447" hits="1"/>
+						<line number="435" hits="1"/>
+						<line number="439" hits="1"/>
+						<line number="441" hits="1"/>
+						<line number="445" hits="1"/>
+						<line number="446" hits="0"/>
 						<line number="448" hits="1"/>
-						<line number="450" hits="1"/>
-						<line number="456" hits="1"/>
-						<line number="460" hits="1"/>
+						<line number="449" hits="1"/>
+						<line number="451" hits="1"/>
+						<line number="457" hits="1"/>
 						<line number="461" hits="1"/>
-						<line number="462" hits="0"/>
-						<line number="463" hits="1"/>
-						<line number="465" hits="1"/>
+						<line number="462" hits="1"/>
+						<line number="463" hits="0"/>
+						<line number="464" hits="1"/>
 						<line number="466" hits="1"/>
-						<line number="469" hits="1"/>
+						<line number="467" hits="1"/>
 						<line number="470" hits="1"/>
 						<line number="471" hits="1"/>
-						<line number="473" hits="1"/>
+						<line number="472" hits="1"/>
+						<line number="474" hits="1"/>
 					</lines>
 				</class>
 			</classes>