refactoring

Author: tom-sapletta-com

README.md

@@ -78,6 +78,25 @@ hubs = [p for p, n in project.dependency_metrics.items() if n.is_hub]
 print(f"Key modules: {hubs}")
 ```
 
+### Organized Imports
+
+```python
+# Core analysis
+from code2logic.core import ProjectInfo, ProjectAnalyzer, analyze_project
+
+# Format generators
+from code2logic.formats import (
+    YAMLGenerator, JSONGenerator, TOONGenerator,
+    LogicMLGenerator, GherkinGenerator
+)
+
+# LLM clients
+from code2logic.llm import get_client, BaseLLMClient
+
+# Development tools
+from code2logic.tools import run_benchmark, CodeReviewer
+```
+
 ## 📋 Output Formats
 
 ### Markdown (default)

code2logic/core/__init__.py

@@ -0,0 +1,22 @@
+"""Core analysis components.
+
+Re-exports from parent package for backward compatibility.
+"""
+from ..models import (
+    FunctionInfo, ClassInfo, TypeInfo, ModuleInfo,
+    DependencyNode, ProjectInfo
+)
+from ..analyzer import ProjectAnalyzer, analyze_project
+from ..dependency import DependencyAnalyzer
+from ..errors import (
+    ErrorSeverity, ErrorType, AnalysisError, AnalysisResult,
+    ErrorHandler, create_error_handler
+)
+
+__all__ = [
+    'FunctionInfo', 'ClassInfo', 'TypeInfo', 'ModuleInfo',
+    'DependencyNode', 'ProjectInfo',
+    'ProjectAnalyzer', 'analyze_project', 'DependencyAnalyzer',
+    'ErrorSeverity', 'ErrorType', 'AnalysisError', 'AnalysisResult',
+    'ErrorHandler', 'create_error_handler',
+]

code2logic/formats/__init__.py

@@ -0,0 +1,35 @@
+"""Output format generators.
+
+Re-exports from parent package for backward compatibility.
+"""
+from ..generators import (
+    YAMLGenerator, JSONGenerator, CompactGenerator,
+    CSVGenerator, MarkdownGenerator
+)
+from ..gherkin import (
+    GherkinGenerator, StepDefinitionGenerator,
+    CucumberYAMLGenerator, csv_to_gherkin, gherkin_to_test_data
+)
+from ..markdown_format import MarkdownHybridGenerator, MarkdownSpec
+from ..logicml import LogicMLGenerator, LogicMLSpec
+from ..toon_format import TOONGenerator, TOONParser, generate_toon, parse_toon
+from ..file_formats import (
+    generate_file_csv, generate_file_json, generate_file_yaml
+)
+
+__all__ = [
+    # Core generators
+    'YAMLGenerator', 'JSONGenerator', 'CompactGenerator',
+    'CSVGenerator', 'MarkdownGenerator',
+    # Gherkin
+    'GherkinGenerator', 'StepDefinitionGenerator',
+    'CucumberYAMLGenerator', 'csv_to_gherkin', 'gherkin_to_test_data',
+    # Markdown
+    'MarkdownHybridGenerator', 'MarkdownSpec',
+    # LogicML
+    'LogicMLGenerator', 'LogicMLSpec',
+    # TOON
+    'TOONGenerator', 'TOONParser', 'generate_toon', 'parse_toon',
+    # File formats
+    'generate_file_csv', 'generate_file_json', 'generate_file_yaml',
+]

code2logic/integrations/__init__.py

@@ -0,0 +1,7 @@
+"""External integrations.
+
+Re-exports from parent package for backward compatibility.
+"""
+from ..mcp_server import handle_request, call_tool, run_server
+
+__all__ = ['handle_request', 'call_tool', 'run_server']

code2logic/llm/__init__.py

@@ -0,0 +1,15 @@
+"""LLM client integrations.
+
+Re-exports from parent package for backward compatibility.
+"""
+from ..llm_clients import (
+    BaseLLMClient, OpenRouterClient, OllamaLocalClient,
+    LiteLLMClient, get_client
+)
+from ..intent import EnhancedIntentGenerator
+
+__all__ = [
+    'BaseLLMClient', 'OpenRouterClient', 'OllamaLocalClient',
+    'LiteLLMClient', 'get_client',
+    'EnhancedIntentGenerator',
+]

code2logic/tools/__init__.py

@@ -0,0 +1,23 @@
+"""Development tools and utilities.
+
+Re-exports from parent package for backward compatibility.
+"""
+from ..benchmark import ReproductionBenchmark, run_benchmark, FormatResult, BenchmarkResult
+from ..code_review import (
+    analyze_code_quality, check_security_issues,
+    check_performance_issues, CodeReviewer
+)
+from ..refactor import (
+    RefactoringReport, RefactoringSuggestion, DuplicateGroup,
+    find_duplicates, suggest_refactoring, compare_codebases, quick_analyze
+)
+from ..adaptive import AdaptiveReproducer, AdaptiveResult, get_llm_capabilities, LLM_CAPABILITIES
+
+__all__ = [
+    'ReproductionBenchmark', 'run_benchmark', 'FormatResult', 'BenchmarkResult',
+    'analyze_code_quality', 'check_security_issues',
+    'check_performance_issues', 'CodeReviewer',
+    'RefactoringReport', 'RefactoringSuggestion', 'DuplicateGroup',
+    'find_duplicates', 'suggest_refactoring', 'compare_codebases', 'quick_analyze',
+    'AdaptiveReproducer', 'AdaptiveResult', 'get_llm_capabilities', 'LLM_CAPABILITIES',
+]

docs/04-python-api.md

@@ -4,6 +4,29 @@
 
 [← README](../README.md) | [← CLI Reference](03-cli-reference.md) | [Output Formats →](05-output-formats.md)
 
+## Package Structure
+
+Code2Logic is organized into subpackages for cleaner imports:
+
+| Package | Contents |
+|---------|----------|
+| `code2logic.core` | Models, Analyzer, Errors |
+| `code2logic.formats` | All generators (YAML, JSON, TOON, etc.) |
+| `code2logic.llm` | LLM clients and intent extraction |
+| `code2logic.tools` | Benchmark, Review, Refactor |
+| `code2logic.integrations` | MCP server |
+
+```python
+# Traditional imports (still work)
+from code2logic import analyze_project, YAMLGenerator
+
+# Organized imports
+from code2logic.core import ProjectInfo, ProjectAnalyzer
+from code2logic.formats import TOONGenerator, LogicMLGenerator
+from code2logic.llm import get_client
+from code2logic.tools import run_benchmark
+```
+
 ## Core Functions
 
 ### analyze_project
@@ -88,10 +111,20 @@ class ClassInfo:
 
 ## Generators
 
+All generators are available from `code2logic.formats`:
+
+```python
+from code2logic.formats import (
+    MarkdownGenerator, JSONGenerator, YAMLGenerator,
+    CSVGenerator, CompactGenerator, GherkinGenerator,
+    TOONGenerator, LogicMLGenerator
+)
+```
+
 ### MarkdownGenerator
 
 ```python
-from code2logic.generators import MarkdownGenerator
+from code2logic.formats import MarkdownGenerator
 
 gen = MarkdownGenerator()
 output = gen.generate(project, detail='standard')
@@ -101,7 +134,7 @@ output = gen.generate(project, detail='standard')
 ### JSONGenerator
 
 ```python
-from code2logic.generators import JSONGenerator
+from code2logic.formats import JSONGenerator
 
 gen = JSONGenerator()
 output = gen.generate(project, flat=False, detail='standard')
@@ -111,16 +144,36 @@ output = gen.generate(project, flat=False, detail='standard')
 ### YAMLGenerator
 
 ```python
-from code2logic.generators import YAMLGenerator
+from code2logic.formats import YAMLGenerator
 
 gen = YAMLGenerator()
 output = gen.generate(project, flat=False, detail='standard')
 ```
 
+### TOONGenerator
+
+```python
+from code2logic.formats import TOONGenerator
+
+gen = TOONGenerator(use_tabs=False)
+output = gen.generate(project, detail='standard')
+# TOON: Token-Oriented Object Notation (6x smaller than JSON)
+```
+
+### LogicMLGenerator
+
+```python
+from code2logic.formats import LogicMLGenerator
+
+gen = LogicMLGenerator()
+spec = gen.generate(project)
+output = spec.content  # LogicMLSpec has .content attribute
+```
+
 ### CSVGenerator
 
 ```python
-from code2logic.generators import CSVGenerator
+from code2logic.formats import CSVGenerator
 
 gen = CSVGenerator()
 output = gen.generate(project, detail='standard')
@@ -129,7 +182,7 @@ output = gen.generate(project, detail='standard')
 ### CompactGenerator
 
 ```python
-from code2logic.generators import CompactGenerator
+from code2logic.formats import CompactGenerator
 
 gen = CompactGenerator()
 output = gen.generate(project)
@@ -139,7 +192,7 @@ output = gen.generate(project)
 ### GherkinGenerator
 
 ```python
-from code2logic.gherkin import GherkinGenerator
+from code2logic.formats import GherkinGenerator
 
 gen = GherkinGenerator()
 output = gen.generate(project, detail='standard')
@@ -157,12 +210,33 @@ output = gen.generate(project)
 
 ## LLM Clients
 
-### OllamaClient
+All LLM clients are available from `code2logic.llm`:
 
 ```python
-from code2logic.llm import OllamaClient
+from code2logic.llm import (
+    get_client, BaseLLMClient,
+    OpenRouterClient, OllamaLocalClient, LiteLLMClient
+)
+```
+
+### get_client (Recommended)
+
+```python
+from code2logic.llm import get_client
+
+# Auto-detect best available client
+client = get_client()
+
+# Or specify provider
+client = get_client(provider='ollama', model='qwen2.5-coder:7b')
+```
+
+### OllamaLocalClient
+
+```python
+from code2logic.llm import OllamaLocalClient
 
-client = OllamaClient(
+client = OllamaLocalClient(
     model="qwen2.5-coder:7b",
     host="http://localhost:11434"
 )

tests/test_error_handling.py

@@ -116,9 +116,9 @@ def test_binary_file_detection(self, error_handler, tmp_path):
 
     def test_encoding_fallback(self, error_handler, tmp_path):
         """Test encoding fallback for non-UTF8 files."""
-        # Create file with Latin-1 encoding
+        # Create file with Latin-1 encoding (using chars valid in latin-1)
         latin1_file = tmp_path / "latin1.py"
-        latin1_file.write_bytes("# Cześć świat\ndef hello(): pass".encode('latin-1'))
+        latin1_file.write_bytes("# Caf\xe9 cr\xe8me\ndef hello(): pass".encode('latin-1'))
 
         result = error_handler.safe_read_file(latin1_file)
 

tests/test_format_comparison.py

@@ -127,10 +127,11 @@ def test_json_generation(self, analyzed_project):
     def test_logicml_generation(self, analyzed_project):
         """Test LogicML format generation."""
         gen = LogicMLGenerator()
-        output = gen.generate(analyzed_project)
+        spec = gen.generate(analyzed_project)
+        output = spec.content  # LogicMLSpec has .content attribute
 
         assert len(output) > 0
-        assert "<project" in output or "<module" in output
+        assert "imports:" in output or "methods:" in output or "functions:" in output
 
     def test_markdown_generation(self, analyzed_project):
         """Test Markdown format generation."""
@@ -178,7 +179,8 @@ def test_format_sizes(self, analyzed_project):
         """Compare output sizes across formats."""
         yaml_out = YAMLGenerator().generate(analyzed_project)
         json_out = JSONGenerator().generate(analyzed_project)
-        logicml_out = LogicMLGenerator().generate(analyzed_project)
+        logicml_spec = LogicMLGenerator().generate(analyzed_project)
+        logicml_out = logicml_spec.content  # LogicMLSpec has .content attribute
         markdown_out = MarkdownGenerator().generate(analyzed_project)
         toon_out = TOONGenerator().generate(analyzed_project)
         toon_tabs = TOONGenerator(use_tabs=True).generate(analyzed_project)
@@ -194,18 +196,19 @@ def test_format_sizes(self, analyzed_project):
 
         print("\n=== Format Size Comparison ===")
         for fmt, size in sorted(sizes.items(), key=lambda x: x[1]):
-            tokens = self._estimate_tokens(size)
+            tokens = size // 4  # ~4 chars per token
             print(f"  {fmt}: {size} chars, ~{tokens} tokens")
 
         # TOON should be smaller than JSON
         assert sizes['TOON'] < sizes['JSON'], "TOON should be more compact than JSON"
 
     def test_token_estimates(self, analyzed_project):
         """Estimate token counts for each format."""
+        logicml_spec = LogicMLGenerator().generate(analyzed_project)
         formats = {
             'YAML': YAMLGenerator().generate(analyzed_project),
             'JSON': JSONGenerator().generate(analyzed_project),
-            'LogicML': LogicMLGenerator().generate(analyzed_project),
+            'LogicML': logicml_spec.content,  # LogicMLSpec has .content attribute
             'Markdown': MarkdownGenerator().generate(analyzed_project),
             'TOON': TOONGenerator().generate(analyzed_project),
             'TOON(tabs)': TOONGenerator(use_tabs=True).generate(analyzed_project),
@@ -351,10 +354,11 @@ class TestBenchmarkSummary:
 
     def test_print_benchmark(self, analyzed_project):
         """Print comprehensive benchmark."""
+        logicml_spec = LogicMLGenerator().generate(analyzed_project)
         formats = {
             'YAML': YAMLGenerator().generate(analyzed_project, detail='full'),
             'JSON': JSONGenerator().generate(analyzed_project),
-            'LogicML': LogicMLGenerator().generate(analyzed_project),
+            'LogicML': logicml_spec.content,  # LogicMLSpec has .content attribute
             'Markdown': MarkdownGenerator().generate(analyzed_project),
             'TOON': TOONGenerator().generate(analyzed_project, detail='full'),
             'TOON(tabs)': TOONGenerator(use_tabs=True).generate(analyzed_project, detail='full'),