openconvert 1.0.0__tar.gz → 1.1.1__tar.gz

{openconvert-1.0.0 → openconvert-1.1.1}/MANIFEST.in

@@ -10,6 +10,9 @@ include .readthedocs.yaml
 # Include scripts
 recursive-include scripts *.py *.sh *.md
 
+# Include source code (src layout)
+recursive-include src *.py
+
 # Exclude unnecessary files
 global-exclude *.pyc
 global-exclude __pycache__

{openconvert-1.0.0 → openconvert-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openconvert
-Version: 1.0.0
+Version: 1.1.1
 Summary: CLI tool for connecting to OpenConvert OpenAgents network for file conversion
 Home-page: https://github.com/acenta-ai/openconvert
 Author: OpenAgents Team
@@ -35,7 +35,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pyyaml>=5.4.0
-Requires-Dist: openagents>=0.5.0
+Requires-Dist: openagents>=0.5.1
 Provides-Extra: dev
 Requires-Dist: pytest>=6.0.0; extra == "dev"
 Requires-Dist: pytest-asyncio>=0.18.0; extra == "dev"

{openconvert-1.0.0 → openconvert-1.1.1}/pyproject.toml

@@ -44,7 +44,7 @@ classifiers = [
 requires-python = ">=3.8"
 dependencies = [
     "pyyaml>=5.4.0",
-    "openagents>=0.5.0",
+    "openagents>=0.5.1",
 ]
 dynamic = ["version"]
 
@@ -78,6 +78,7 @@ openconvert = "openconvert.openconvert_cli:main"
 include-package-data = true
 
 [tool.setuptools.packages.find]
+where = ["src"]
 include = ["openconvert*"]
 
 [tool.setuptools.dynamic]
@@ -115,6 +116,8 @@ warn_unused_ignores = true
 warn_no_return = true
 warn_unreachable = true
 strict_equality = true
+# mypy needs to know the package path for src layout
+mypy_path = "src"
 
 [tool.pytest.ini_options]
 minversion = "6.0"
@@ -122,4 +125,6 @@ addopts = "-ra -q"
 testpaths = [
     "tests",
 ]
-asyncio_mode = "auto" 
+asyncio_mode = "auto"
+# pytest needs to know where to find the package
+pythonpath = ["src"] 

{openconvert-1.0.0 → openconvert-1.1.1}/setup.py

@@ -15,7 +15,7 @@ def read_readme():
 
 # Get version from __init__.py
 def get_version():
-    init_path = os.path.join(os.path.dirname(__file__), "openconvert", "__init__.py")
+    init_path = os.path.join(os.path.dirname(__file__), "src", "openconvert", "__init__.py")
     with open(init_path, "r", encoding="utf-8") as f:
         content = f.read()
         version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]", content, re.M)
@@ -39,7 +39,8 @@ setup(
         "Source": "https://github.com/acenta-ai/openconvert",
         "Documentation": "https://openconvert.readthedocs.io/",
     },
-    packages=find_packages(),
+    package_dir={"": "src"},
+    packages=find_packages(where="src"),
     include_package_data=True,
     install_requires=[
         "pyyaml>=5.4.0",

openconvert-1.1.1/src/openconvert/__init__.py

@@ -0,0 +1,100 @@
+"""
+OpenConvert CLI Tool
+
+A command-line interface for connecting to the OpenConvert OpenAgents network
+to discover file conversion services and perform file conversions.
+"""
+
+import asyncio
+from pathlib import Path
+from typing import Optional, List
+
+__version__ = "1.1.1"
+__author__ = "OpenAgents Team"
+__email__ = "team@openagents.com"
+
+# Import the async convert function
+try:
+    from openconvert.openconvert_cli import convert as _async_convert
+except ImportError:
+    from openconvert_cli import convert as _async_convert
+
+
+def convert(
+    input_files: List[Path],
+    output_path: Path,
+    host: str = "network.openconvert.ai",
+    port: int = 8765,
+) -> bool:
+    """
+    Convert files using the OpenConvert network.
+    
+    Args:
+        input_files: List of input file paths to convert
+        output_path: Output file path  
+        host: OpenConvert network host (default: network.openconvert.ai)
+        port: OpenConvert network port (default: 8765)
+        
+    Returns:
+        bool: True if conversion successful, False otherwise
+    """
+    try:
+        result = asyncio.run(_async_convert(
+            input_files=input_files,
+            output_path=output_path,
+            host=host,
+            port=port
+        ))
+        return result
+    except Exception as e:
+        print(f"Conversion failed: {e}")
+        return False
+
+
+def convert_file(
+    input_path: str, 
+    output_path: str,
+    host: str = "network.openconvert.ai",
+    port: int = 8765
+) -> bool:
+    """
+    Convert a single file using the OpenConvert network.
+    
+    Args:
+        input_path: Path to input file
+        output_path: Path for output file
+        host: OpenConvert network host (default: network.openconvert.ai)
+        port: OpenConvert network port (default: 8765)
+        
+    Returns:
+        bool: True if conversion successful, False otherwise
+        
+    Example:
+        >>> from openconvert import convert_file
+        >>> success = convert_file("document.txt", "document.pdf")
+        >>> if success:
+        ...     print("Conversion completed!")
+    """
+    try:
+        input_files = [Path(input_path)]
+        output_file = Path(output_path)
+        
+        return convert(
+            input_files=input_files,
+            output_path=output_file,
+            host=host,
+            port=port
+        )
+    except Exception as e:
+        print(f"File conversion failed: {e}")
+        return False
+
+
+# Export main functions
+__all__ = [
+    "convert",
+    "convert_file",
+    "__version__",
+    "__author__",
+    "__email__",
+] 

{openconvert-1.0.0 → openconvert-1.1.1/src}/openconvert/__main__.py

@@ -7,7 +7,7 @@ Allows running the OpenConvert CLI as a module:
 """
 
 import sys
-from .openconvert_cli import main
+from openconvert.openconvert_cli import main
 
 if __name__ == "__main__":
     sys.exit(main()) 

{openconvert-1.0.0 → openconvert-1.1.1/src}/openconvert/openconvert_cli.py

@@ -25,10 +25,7 @@ current_dir = Path(__file__).resolve().parent
 openagents_root = current_dir.parent.parent
 sys.path.insert(0, str(openagents_root / "src"))
 
-try:
-    from .client import OpenConvertClient
-except ImportError:
-    from client import OpenConvertClient
+from openconvert.client import OpenConvertClient
 
 # Set up logging
 logging.basicConfig(
@@ -89,7 +86,9 @@ def validate_args(args: argparse.Namespace) -> bool:
     """
     # For conversion operations, input and output are required
     if not args.input or not args.output:
-        logger.error("Input (-i) and output (-o) arguments are required for conversion")
+        logger.error("Input and output are required for conversion")
+        logger.error("Usage: openconvert <input> <output>")
+        logger.error("   or: openconvert -i <input> -o <output>")
         return False
     
     # Check input exists
@@ -105,10 +104,17 @@ def validate_args(args: argparse.Namespace) -> bool:
         logger.error(f"Output directory does not exist: {output_dir}")
         return False
     
-    # If input is a directory, require --from and --to
+    # If input is a directory, require --from and --to (positional args don't support directory conversion)
     if input_path.is_dir():
         if not args.from_format or not args.to_format:
             logger.error("When input is a directory, --from and --to formats must be specified")
+            logger.error("Example: openconvert -i docs/ -o converted/ --from text/plain --to application/pdf")
+            return False
+        
+        # For directory conversion, must use flag arguments
+        if hasattr(args, 'input_file') and (args.input_file or args.output_file):
+            logger.error("Directory conversion requires -i and -o flags, not positional arguments")
+            logger.error("Example: openconvert -i docs/ -o converted/ --from text/plain --to application/pdf")
             return False
     
     return True
@@ -391,24 +397,36 @@ def main() -> int:
     """Main CLI entry point.
     
     Returns:
-        int: Exit code (0 = success, 1 = error)
+        int: Exit code (0 for success, 1 for error)
     """
     parser = argparse.ArgumentParser(
-        description="OpenConvert CLI - Connect to OpenAgents network for file conversion",
+        prog="openconvert",
+        description="Connect to OpenConvert OpenAgents network for file conversions",
         formatter_class=argparse.RawDescriptionHelpFormatter,
-        epilog="""
+        epilog=f"""
 Examples:
-  # Convert single file (formats auto-detected)
-  openconvert -i document.txt -o document.pdf
+  # Simple file conversion (positional arguments)
+  openconvert input.txt output.pdf
+  openconvert image.png image.jpg
+  
+  # Using flags (traditional way)  
+  openconvert -i input.txt -o output.pdf
+  openconvert -i image.png -o image.jpg
   
-  # Convert directory with specific formats
-  openconvert -i images/ -o converted/ --from image/png --to application/pdf
+  # Directory conversion (requires format specification)
+  openconvert -i docs/ -o converted/ --from text/plain --to application/pdf
+  
+  # Convert with format specification
+  openconvert input.data output.pdf --from text/csv --to application/pdf
   
   # Convert with custom prompt
-  openconvert -i data.csv -o report.pdf --prompt "Create a formatted report with charts"
+  openconvert data.csv report.pdf --prompt "Create a formatted report with charts"
   
   # Specify network connection
-  openconvert -i file.doc -o file.md --host remote.server.com --port 8765
+  openconvert file.doc file.md --host remote.server.com --port 8765
+  
+  # List available formats
+  openconvert --list-formats
 
 Supported formats include:
   Documents: txt, pdf, docx, html, md, rtf, csv, xlsx
@@ -421,7 +439,19 @@ Supported formats include:
         """
     )
     
-    # Arguments (required for conversion, optional for discovery)
+    # Positional arguments (optional)
+    parser.add_argument(
+        "input_file",
+        nargs="?",
+        help="Input file path (alternative to -i/--input)"
+    )
+    parser.add_argument(
+        "output_file", 
+        nargs="?",
+        help="Output file path (alternative to -o/--output)"
+    )
+    
+    # Traditional flag arguments (for backward compatibility and directory operations)
     parser.add_argument(
         "-i", "--input",
         help="Input file or directory path"
@@ -482,6 +512,12 @@ Supported formats include:
     # Parse arguments
     args = parser.parse_args()
     
+    # Merge positional and flag arguments (positional takes precedence)
+    if args.input_file:
+        args.input = args.input_file
+    if args.output_file:
+        args.output = args.output_file
+    
     # Configure logging level
     if args.quiet:
         logging.getLogger().setLevel(logging.ERROR)