cinchdb 0.1.3__tar.gz → 0.1.5__tar.gz

{cinchdb-0.1.3 → cinchdb-0.1.5}/.gitignore

@@ -68,4 +68,6 @@ Thumbs.db
 
 site/
 
-saas/
+saas/
+
+test_cinch_init

{cinchdb-0.1.3 → cinchdb-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cinchdb
-Version: 0.1.3
+Version: 0.1.5
 Summary: A Git-like SQLite database management system with branching and multi-tenancy
 Project-URL: Homepage, https://github.com/russellromney/cinchdb
 Project-URL: Documentation, https://russellromney.github.io/cinchdb
@@ -31,7 +31,7 @@ Description-Content-Type: text/markdown
 
 NOTE: CinchDB is in early alpha. This is project to test out an idea. Do not use this in production.
 
-CinchDB is for projects that need fast queries, data isolated data per-tenant [or even per-user](https://turso.tech/blog/give-each-of-your-users-their-own-sqlite-database-b74445f4), and a branchable database.
+CinchDB is for projects that need fast queries, data isolated data per-tenant [or even per-user](https://turso.tech/blog/give-each-of-your-users-their-own-sqlite-database-b74445f4), and a branchable database that makes it easy to merge changes between branches.
 
 On a meta level, I made this because I wanted a database structure that I felt comfortable letting AI agents take full control over, safely, and I didn't want to run my own Postgres instance somewhere or pay for it on e.g. Neon - I don't need hyperscaling, I just need super fast queries.
 

{cinchdb-0.1.3 → cinchdb-0.1.5}/README.md

@@ -4,7 +4,7 @@
 
 NOTE: CinchDB is in early alpha. This is project to test out an idea. Do not use this in production.
 
-CinchDB is for projects that need fast queries, data isolated data per-tenant [or even per-user](https://turso.tech/blog/give-each-of-your-users-their-own-sqlite-database-b74445f4), and a branchable database.
+CinchDB is for projects that need fast queries, data isolated data per-tenant [or even per-user](https://turso.tech/blog/give-each-of-your-users-their-own-sqlite-database-b74445f4), and a branchable database that makes it easy to merge changes between branches.
 
 On a meta level, I made this because I wanted a database structure that I felt comfortable letting AI agents take full control over, safely, and I didn't want to run my own Postgres instance somewhere or pay for it on e.g. Neon - I don't need hyperscaling, I just need super fast queries.
 

{cinchdb-0.1.3 → cinchdb-0.1.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cinchdb"
-version = "0.1.3"
+version = "0.1.5"
 description = "A Git-like SQLite database management system with branching and multi-tenancy"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -51,7 +51,6 @@ include = [
 
 # Explicitly exclude other directories
 exclude = [
-    "frontend/",
     "docs/",
     "sdk/",
     "site/",

{cinchdb-0.1.3 → cinchdb-0.1.5}/src/cinchdb/cli/commands/branch.py

@@ -81,14 +81,14 @@ def create(
 ):
     """Create a new branch."""
     name = validate_required_arg(name, "name", ctx)
-    
+
     # Validate branch name
     try:
         validate_name(name, "branch")
     except InvalidNameError as e:
         console.print(f"[red]❌ {e}[/red]")
         raise typer.Exit(1)
-        
+
     config, config_data = get_config_with_data()
     db_name = config_data.active_database
     source_branch = source or config_data.active_branch
@@ -338,24 +338,25 @@ def changes(
 
     try:
         from cinchdb.managers.change_tracker import ChangeTracker
-        
+
         tracker = ChangeTracker(config.project_dir, db_name, branch_name)
         changes = tracker.get_changes()
 
         if not changes:
-            console.print(f"[yellow]No changes found in branch '{branch_name}'[/yellow]")
+            console.print(
+                f"[yellow]No changes found in branch '{branch_name}'[/yellow]"
+            )
             return
 
         if format == "json":
             # JSON output
             import json
-            from datetime import datetime
-            
+
             changes_data = []
             for change in changes:
-                change_dict = change.model_dump(mode='json')
+                change_dict = change.model_dump(mode="json")
                 changes_data.append(change_dict)
-            
+
             console.print(json.dumps(changes_data, indent=2, default=str))
         else:
             # Table output
@@ -368,24 +369,32 @@ def changes(
             table.add_column("Created", style="dim")
 
             for change in changes:
-                created_at = change.created_at.strftime("%Y-%m-%d %H:%M:%S") if change.created_at else "Unknown"
+                created_at = (
+                    change.created_at.strftime("%Y-%m-%d %H:%M:%S")
+                    if change.created_at
+                    else "Unknown"
+                )
                 applied_status = "✓" if change.applied else "✗"
                 table.add_row(
                     change.id[:8] if change.id else "Unknown",
-                    change.type.value if hasattr(change.type, 'value') else str(change.type),
+                    change.type.value
+                    if hasattr(change.type, "value")
+                    else str(change.type),
                     change.entity_name,
                     change.entity_type,
                     applied_status,
-                    created_at
+                    created_at,
                 )
 
             console.print(table)
-            
+
             # Summary
             total = len(changes)
             applied = sum(1 for c in changes if c.applied)
             unapplied = total - applied
-            console.print(f"\n[bold]Total:[/bold] {total} changes ({applied} applied, {unapplied} unapplied)")
+            console.print(
+                f"\n[bold]Total:[/bold] {total} changes ({applied} applied, {unapplied} unapplied)"
+            )
 
     except ValueError as e:
         console.print(f"[red]❌ {e}[/red]")

{cinchdb-0.1.3 → cinchdb-0.1.5}/src/cinchdb/cli/commands/column.py

@@ -235,7 +235,10 @@ def alter_nullable(
         None, "--nullable/--not-nullable", help="Make column nullable or NOT NULL"
     ),
     fill_value: Optional[str] = typer.Option(
-        None, "--fill-value", "-f", help="Value to use for NULL values when making NOT NULL"
+        None,
+        "--fill-value",
+        "-f",
+        help="Value to use for NULL values when making NOT NULL",
     ),
     apply: bool = typer.Option(
         True, "--apply/--no-apply", help="Apply changes to all tenants"
@@ -244,20 +247,22 @@ def alter_nullable(
     """Change the nullable constraint on a column."""
     table = validate_required_arg(table, "table", ctx)
     column = validate_required_arg(column, "column", ctx)
-    
+
     # Validate nullable flag was provided
     if nullable is None:
         console.print(ctx.get_help())
-        console.print("\n[red]❌ Error: Must specify either --nullable or --not-nullable[/red]")
+        console.print(
+            "\n[red]❌ Error: Must specify either --nullable or --not-nullable[/red]"
+        )
         raise typer.Exit(1)
-    
+
     config, config_data = get_config_with_data()
     db_name = config_data.active_database
     branch_name = config_data.active_branch
 
     try:
         column_mgr = ColumnManager(config.project_dir, db_name, branch_name, "main")
-        
+
         # Check if column has NULLs when making NOT NULL
         if not nullable and fill_value is None:
             # Get column info to check current state
@@ -266,18 +271,22 @@ def alter_nullable(
                 # Check for NULL values
                 from cinchdb.core.connection import DatabaseConnection
                 from cinchdb.core.path_utils import get_tenant_db_path
-                
-                db_path = get_tenant_db_path(config.project_dir, db_name, branch_name, "main")
+
+                db_path = get_tenant_db_path(
+                    config.project_dir, db_name, branch_name, "main"
+                )
                 with DatabaseConnection(db_path) as conn:
                     cursor = conn.execute(
                         f"SELECT COUNT(*) FROM {table} WHERE {column} IS NULL"
                     )
                     null_count = cursor.fetchone()[0]
-                    
+
                     if null_count > 0:
-                        console.print(f"[yellow]Column '{column}' has {null_count} NULL values.[/yellow]")
+                        console.print(
+                            f"[yellow]Column '{column}' has {null_count} NULL values.[/yellow]"
+                        )
                         fill_value = typer.prompt("Provide a fill value")
-        
+
         # Convert fill_value to appropriate type
         if fill_value is not None:
             # Try to interpret the value
@@ -288,13 +297,17 @@ def alter_nullable(
             elif fill_value.replace(".", "", 1).isdigit():
                 fill_value = float(fill_value)
             # Otherwise keep as string
-        
+
         column_mgr.alter_column_nullable(table, column, nullable, fill_value)
-        
+
         if nullable:
-            console.print(f"[green]✅ Made column '{column}' nullable in table '{table}'[/green]")
+            console.print(
+                f"[green]✅ Made column '{column}' nullable in table '{table}'[/green]"
+            )
         else:
-            console.print(f"[green]✅ Made column '{column}' NOT NULL in table '{table}'[/green]")
+            console.print(
+                f"[green]✅ Made column '{column}' NOT NULL in table '{table}'[/green]"
+            )
 
         if apply:
             # Apply to all tenants

{cinchdb-0.1.3 → cinchdb-0.1.5}/src/cinchdb/cli/commands/database.py

@@ -65,14 +65,14 @@ def create(
 ):
     """Create a new database."""
     name = validate_required_arg(name, "name", ctx)
-    
+
     # Validate database name
     try:
         validate_name(name, "database")
     except InvalidNameError as e:
         console.print(f"[red]❌ {e}[/red]")
         raise typer.Exit(1)
-    
+
     config, config_data = get_config_with_data()
 
     # Create database directory structure

{cinchdb-0.1.3 → cinchdb-0.1.5}/src/cinchdb/cli/commands/query.py

@@ -5,14 +5,20 @@ from typing import Optional
 from rich.console import Console
 from rich.table import Table as RichTable
 
-from cinchdb.cli.utils import get_config_with_data, get_cinchdb_instance
-from cinchdb.managers.query import QueryManager
+from cinchdb.cli.utils import get_cinchdb_instance
 
 app = typer.Typer(help="Execute SQL queries", invoke_without_command=True)
 console = Console()
 
 
-def execute_query(sql: str, tenant: str, format: str, limit: Optional[int], force_local: bool = False, remote_alias: Optional[str] = None):
+def execute_query(
+    sql: str,
+    tenant: str,
+    format: str,
+    limit: Optional[int],
+    force_local: bool = False,
+    remote_alias: Optional[str] = None,
+):
     """Execute a SQL query."""
     # Add LIMIT if specified
     query_sql = sql
@@ -20,7 +26,9 @@ def execute_query(sql: str, tenant: str, format: str, limit: Optional[int], forc
         query_sql = f"{sql} LIMIT {limit}"
 
     # Get CinchDB instance (handles local/remote automatically)
-    db = get_cinchdb_instance(tenant=tenant, force_local=force_local, remote_alias=remote_alias)
+    db = get_cinchdb_instance(
+        tenant=tenant, force_local=force_local, remote_alias=remote_alias
+    )
 
     try:
         # Check if this is a SELECT query
@@ -74,6 +82,7 @@ def execute_query(sql: str, tenant: str, format: str, limit: Optional[int], forc
             if db.is_local:
                 # For local connections, use the query manager directly
                 from cinchdb.managers.query import QueryManager
+
                 query_mgr = QueryManager(db.project_dir, db.database, db.branch, tenant)
                 affected_rows = query_mgr.execute_non_query(query_sql)
                 console.print(
@@ -84,10 +93,8 @@ def execute_query(sql: str, tenant: str, format: str, limit: Optional[int], forc
                 # For remote connections, the API should handle all SQL types
                 # This might need API support - for now, try using query
                 try:
-                    result = db.query(query_sql)
-                    console.print(
-                        f"[green]✅ Query executed successfully[/green]"
-                    )
+                    db.query(query_sql)
+                    console.print("[green]✅ Query executed successfully[/green]")
                 except Exception as e:
                     # If remote doesn't support non-SELECT via query, show helpful message
                     console.print(
@@ -112,9 +119,7 @@ def main(
     limit: Optional[int] = typer.Option(
         None, "--limit", "-l", help="Limit number of rows"
     ),
-    local: bool = typer.Option(
-        False, "--local", "-L", help="Force local connection"
-    ),
+    local: bool = typer.Option(False, "--local", "-L", help="Force local connection"),
     remote: Optional[str] = typer.Option(
         None, "--remote", "-r", help="Use specific remote alias"
     ),
@@ -133,4 +138,6 @@ def main(
         if not sql:
             console.print(ctx.get_help())
             raise typer.Exit(0)
-        execute_query(sql, tenant, format, limit, force_local=local, remote_alias=remote)
+        execute_query(
+            sql, tenant, format, limit, force_local=local, remote_alias=remote
+        )

{cinchdb-0.1.3 → cinchdb-0.1.5}/src/cinchdb/cli/commands/remote.py

@@ -21,25 +21,27 @@ def add_remote(
 ):
     """Add a remote CinchDB instance configuration."""
     alias = validate_required_arg(alias, "alias", ctx)
-    
+
     if not url:
         console.print("[red]❌ Error: --url is required[/red]")
         raise typer.Exit(1)
-    
+
     if not key:
         console.print("[red]❌ Error: --key is required[/red]")
         raise typer.Exit(1)
-    
+
     config, config_data = get_config_with_data()
-    
+
     # Check if alias already exists
     if alias in config_data.remotes:
-        console.print(f"[yellow]⚠️  Remote '{alias}' already exists. Updating...[/yellow]")
-    
+        console.print(
+            f"[yellow]⚠️  Remote '{alias}' already exists. Updating...[/yellow]"
+        )
+
     # Add or update the remote
     config_data.remotes[alias] = RemoteConfig(url=url.rstrip("/"), key=key)
     config.save(config_data)
-    
+
     console.print(f"[green]✓ Remote '{alias}' configured successfully[/green]")
 
 
@@ -47,20 +49,20 @@ def add_remote(
 def list_remotes():
     """List all configured remote instances."""
     config, config_data = get_config_with_data()
-    
+
     if not config_data.remotes:
         console.print("[yellow]No remotes configured[/yellow]")
         return
-    
+
     table = Table(title="Configured Remotes")
     table.add_column("Alias", style="cyan")
     table.add_column("URL", style="green")
     table.add_column("Active", style="yellow")
-    
+
     for alias, remote in config_data.remotes.items():
         is_active = "✓" if alias == config_data.active_remote else ""
         table.add_row(alias, remote.url, is_active)
-    
+
     console.print(table)
 
 
@@ -71,20 +73,20 @@ def remove_remote(
 ):
     """Remove a remote configuration."""
     alias = validate_required_arg(alias, "alias", ctx)
-    
+
     config, config_data = get_config_with_data()
-    
+
     if alias not in config_data.remotes:
         console.print(f"[red]❌ Remote '{alias}' not found[/red]")
         raise typer.Exit(1)
-    
+
     # Remove the remote
     del config_data.remotes[alias]
-    
+
     # If this was the active remote, clear it
     if config_data.active_remote == alias:
         config_data.active_remote = None
-    
+
     config.save(config_data)
     console.print(f"[green]✓ Remote '{alias}' removed[/green]")
 
@@ -96,16 +98,16 @@ def use_remote(
 ):
     """Set the active remote instance."""
     alias = validate_required_arg(alias, "alias", ctx)
-    
+
     config, config_data = get_config_with_data()
-    
+
     if alias not in config_data.remotes:
         console.print(f"[red]❌ Remote '{alias}' not found[/red]")
         raise typer.Exit(1)
-    
+
     config_data.active_remote = alias
     config.save(config_data)
-    
+
     console.print(f"[green]✓ Now using remote '{alias}'[/green]")
     console.print(f"[dim]URL: {config_data.remotes[alias].url}[/dim]")
 
@@ -114,14 +116,14 @@ def use_remote(
 def clear_remote():
     """Clear the active remote (switch back to local mode)."""
     config, config_data = get_config_with_data()
-    
+
     if not config_data.active_remote:
         console.print("[yellow]No active remote set[/yellow]")
         return
-    
+
     config_data.active_remote = None
     config.save(config_data)
-    
+
     console.print("[green]✓ Cleared active remote. Now using local mode.[/green]")
 
 
@@ -129,16 +131,18 @@ def clear_remote():
 def show_remote():
     """Show the currently active remote."""
     config, config_data = get_config_with_data()
-    
+
     if not config_data.active_remote:
         console.print("[yellow]No active remote. Using local mode.[/yellow]")
         return
-    
+
     alias = config_data.active_remote
     if alias not in config_data.remotes:
-        console.print(f"[red]❌ Active remote '{alias}' not found in configuration[/red]")
+        console.print(
+            f"[red]❌ Active remote '{alias}' not found in configuration[/red]"
+        )
         return
-    
+
     remote = config_data.remotes[alias]
     console.print(f"[green]Active remote:[/green] {alias}")
-    console.print(f"[dim]URL: {remote.url}[/dim]")
+    console.print(f"[dim]URL: {remote.url}[/dim]")

{cinchdb-0.1.3 → cinchdb-0.1.5}/src/cinchdb/cli/commands/table.py

@@ -60,7 +60,8 @@ def create(
     ctx: typer.Context,
     name: Optional[str] = typer.Argument(None, help="Name of the table"),
     columns: Optional[List[str]] = typer.Argument(
-        None, help="Column definitions (format: name:type[:nullable][:fk=table[.column][:action]])"
+        None,
+        help="Column definitions (format: name:type[:nullable][:fk=table[.column][:action]])",
     ),
     apply: bool = typer.Option(
         True, "--apply/--no-apply", help="Apply changes to all tenants"
@@ -92,14 +93,16 @@ def create(
         parts = col_def.split(":")
         if len(parts) < 2:
             console.print(f"[red]❌ Invalid column definition: '{col_def}'[/red]")
-            console.print("[yellow]Format: name:type[:nullable][:fk=table[.column][:action]][/yellow]")
+            console.print(
+                "[yellow]Format: name:type[:nullable][:fk=table[.column][:action]][/yellow]"
+            )
             raise typer.Exit(1)
 
         col_name = parts[0]
         col_type = parts[1].upper()
         nullable = False
         foreign_key = None
-        
+
         # Parse additional parts
         for i in range(2, len(parts)):
             part = parts[i]
@@ -108,7 +111,7 @@ def create(
             elif part.startswith("fk="):
                 # Parse foreign key definition
                 fk_def = part[3:]  # Remove "fk=" prefix
-                
+
                 # Handle actions with spaces (e.g., "set null", "no action")
                 # Check for known actions at the end
                 fk_action = "RESTRICT"  # Default
@@ -116,12 +119,12 @@ def create(
                     if fk_def.lower().endswith("." + action):
                         fk_action = action.upper()
                         # Remove the action part from fk_def
-                        fk_def = fk_def[:-len("." + action)]
+                        fk_def = fk_def[: -len("." + action)]
                         break
-                
+
                 # Now split the remaining parts
                 fk_parts = fk_def.split(".")
-                
+
                 if len(fk_parts) == 1:
                     # Just table name, column defaults to "id"
                     fk_table = fk_parts[0]
@@ -131,15 +134,17 @@ def create(
                     fk_table = fk_parts[0]
                     fk_column = fk_parts[1]
                 else:
-                    console.print(f"[red]❌ Invalid foreign key format: '{fk_def}'[/red]")
+                    console.print(
+                        f"[red]❌ Invalid foreign key format: '{fk_def}'[/red]"
+                    )
                     console.print("[yellow]Format: fk=table[.column][:action][/yellow]")
                     raise typer.Exit(1)
-                
+
                 foreign_key = ForeignKeyRef(
                     table=fk_table,
                     column=fk_column,
                     on_delete=fk_action,
-                    on_update="RESTRICT"  # Default to RESTRICT for updates
+                    on_update="RESTRICT",  # Default to RESTRICT for updates
                 )
 
         if col_type not in ["TEXT", "INTEGER", "REAL", "BLOB", "NUMERIC"]:
@@ -149,12 +154,11 @@ def create(
             )
             raise typer.Exit(1)
 
-        parsed_columns.append(Column(
-            name=col_name, 
-            type=col_type, 
-            nullable=nullable,
-            foreign_key=foreign_key
-        ))
+        parsed_columns.append(
+            Column(
+                name=col_name, type=col_type, nullable=nullable, foreign_key=foreign_key
+            )
+        )
 
     try:
         table_mgr = TableManager(config.project_dir, db_name, branch_name, "main")

{cinchdb-0.1.3 → cinchdb-0.1.5}/src/cinchdb/cli/commands/tenant.py

@@ -71,14 +71,14 @@ def create(
 ):
     """Create a new tenant."""
     name = validate_required_arg(name, "name", ctx)
-    
+
     # Validate tenant name
     try:
         validate_name(name, "tenant")
     except InvalidNameError as e:
         console.print(f"[red]❌ {e}[/red]")
         raise typer.Exit(1)
-        
+
     config, config_data = get_config_with_data()
     db_name = config_data.active_database
     branch_name = config_data.active_branch
@@ -164,14 +164,14 @@ def rename(
     """Rename a tenant."""
     old_name = validate_required_arg(old_name, "old_name", ctx)
     new_name = validate_required_arg(new_name, "new_name", ctx)
-    
+
     # Validate new tenant name
     try:
         validate_name(new_name, "tenant")
     except InvalidNameError as e:
         console.print(f"[red]❌ {e}[/red]")
         raise typer.Exit(1)
-        
+
     config, config_data = get_config_with_data()
     db_name = config_data.active_database
     branch_name = config_data.active_branch

{cinchdb-0.1.3 → cinchdb-0.1.5}/src/cinchdb/cli/main.py

@@ -73,18 +73,27 @@ def init(
     path: Optional[Path] = typer.Argument(
         None, help="Directory to initialize project in (default: current directory)"
     ),
+    database: Optional[str] = typer.Option(
+        "main", "--database", "-d", help="Initial database name"
+    ),
+    branch: Optional[str] = typer.Option(
+        "main", "--branch", "-b", help="Initial branch name"
+    ),
 ):
     """Initialize a new CinchDB project."""
-    from cinchdb.config import Config
+    from cinchdb.core.initializer import init_project
 
     project_path = path or Path.cwd()
 
     try:
-        config = Config(project_path)
-        config.init_project()
+        # Use the core initializer directly
+        init_project(
+            project_dir=project_path, database_name=database, branch_name=branch
+        )
         typer.secho(
             f"✅ Initialized CinchDB project in {project_path}", fg=typer.colors.GREEN
         )
+        typer.secho(f"   Database: {database}, Branch: {branch}", fg=typer.colors.CYAN)
     except FileExistsError:
         typer.secho(f"❌ Project already exists in {project_path}", fg=typer.colors.RED)
         raise typer.Exit(1)
@@ -103,31 +112,32 @@ def status():
     """Show CinchDB status including configuration and environment variables."""
     from cinchdb.cli.utils import get_config_with_data, show_env_config
     from rich.console import Console
-    from rich.table import Table as RichTable
-    
+
     console = Console()
-    
+
     # Show project configuration
     try:
         config, config_data = get_config_with_data()
-        
+
         console.print("\n[bold]CinchDB Status[/bold]")
         console.print(f"Project: {config.project_dir}")
         console.print(f"Active Database: {config_data.active_database}")
         console.print(f"Active Branch: {config_data.active_branch}")
-        
+
         if config_data.active_remote:
             console.print(f"Active Remote: {config_data.active_remote}")
             if config_data.active_remote in config_data.remotes:
                 remote = config_data.remotes[config_data.active_remote]
                 console.print(f"  URL: {remote.url}")
-                console.print(f"  Key: ***{remote.key[-8:] if len(remote.key) > 8 else '*' * len(remote.key)}")
+                console.print(
+                    f"  Key: ***{remote.key[-8:] if len(remote.key) > 8 else '*' * len(remote.key)}"
+                )
         else:
             console.print("Active Remote: [dim]None (local mode)[/dim]")
-        
+
         # Show environment variables
         show_env_config()
-        
+
     except Exception as e:
         console.print(f"[red]❌ Error: {e}[/red]")
         raise typer.Exit(1)