@an5/orm 1.0.9 → 1.1.0

package/generator/src/python-generator.ts

@@ -1,11 +1,30 @@
 import fs from 'fs';
 import path from 'path';
-import { Model } from './types';
+import { Model, Field, bracketedTableName } from './types';
+import { fieldKind } from './type-kinds';
+import { Provider } from './field-types';
 
 export class PythonGenerator {
   constructor(private outputPath: string) {}
 
+  /**
+   * The metadata module name, taken from the configured file name itself.
+   *
+   * The imports used to hardcode `an5_metadata` while `outputPath` was
+   * configurable, so setting `python.metadataFile` to another name (say
+   * `an5Metadata.py`) still generated `from an5_metadata import ...` and the
+   * client broke on import — a failure that only showed up at runtime.
+   */
+  private metadataModule(): string {
+    return path.basename(this.outputPath).replace(/\.py$/i, '');
+  }
+
+  /** The database being generated for; decides types like `TIMESTAMP`. */
+  private provider: Provider | undefined;
+
   public generate(models: Model[]) {
+    this.provider = models[0]?.provider;
+
     const outputDir = path.dirname(this.outputPath);
     if (!fs.existsSync(outputDir)) {
       fs.mkdirSync(outputDir, { recursive: true });
@@ -14,26 +33,33 @@ export class PythonGenerator {
     // 1. Generate an5_metadata.py
     this.generateMetadata(models);
 
-    // 2. Generate an5_models.py
-    this.generateModels(models, outputDir);
+    // 2. Generate per-model entity files like dotnet (<Model>.py)
+    for (const model of models) {
+      this.generateModelFile(model, outputDir);
+    }
 
-    // 3. Generate an5_orm_types.py - type-safe ORM filter/args dataclasses
+    // 3. Generate an5_models.py as backward-compat aggregator
+    this.generateModelsIndex(models, outputDir);
+
+    // 4. Generate an5_orm_types.py - type-safe ORM filter/args dataclasses
     this.generateOrmTypes(models, outputDir);
 
-    // 4. Generate an5_client.py
+    // 5. Generate an5_client.py
     this.generateClient(models, outputDir);
 
-    // 5. Generate __init__.py
+    // 6. Generate __init__.py
     this.generateInit(models, outputDir);
   }
 
-  private getPyFilterType(fieldType: string): string {
-    const lower = fieldType.toLowerCase();
-    if (['datetime', 'datetime2', 'date', 'smalldatetime', 'datetimeoffset', 'timestamp'].includes(lower)) return 'DateTimeFilter';
-    if (['bool', 'boolean', 'bit'].includes(lower)) return 'BoolFilter';
-    if (['int', 'integer', 'smallint', 'tinyint', 'bigint', 'number'].includes(lower)) return 'IntFilter';
-    if (['float', 'real', 'double', 'decimal', 'numeric', 'money'].includes(lower)) return 'NumberFilter';
-    return 'StringFilter';
+  private getPyFilterType(field: Field): string {
+    switch (fieldKind(field, this.provider)) {
+      case 'date': return 'DateTimeFilter';
+      case 'bool': return 'BoolFilter';
+      case 'int':
+      case 'bigint': return 'IntFilter';
+      case 'float': return 'NumberFilter';
+      default: return 'StringFilter';
+    }
   }
 
   private generateOrmTypes(models: Model[], outputDir: string) {
@@ -67,7 +93,7 @@ export class PythonGenerator {
       content += `    OR: Optional[List['${name}WhereInput']] = None\n`;
       content += `    NOT: Optional['${name}WhereInput'] = None\n`;
       for (const f of model.fields) {
-        const ft = this.getPyFilterType(f.type);
+        const ft = this.getPyFilterType(f);
         content += `    ${this.toSnakeCase(f.name)}: Optional[${ft}] = None\n`;
       }
       content += '\n';
@@ -84,10 +110,10 @@ export class PythonGenerator {
       const optionalFields = model.fields.filter(f => !f.isId && (f.isOptional || f.hasDefault));
       content += `@dataclass\nclass ${name}CreateInput:\n    """Typed data for creating a new ${name} record."""\n`;
       for (const f of requiredFields) {
-        content += `    ${this.toSnakeCase(f.name)}: ${this.mapPyType(f.type)}\n`;
+        content += `    ${this.toSnakeCase(f.name)}: ${this.mapPyType(f)}\n`;
       }
       for (const f of optionalFields) {
-        content += `    ${this.toSnakeCase(f.name)}: Optional[${this.mapPyType(f.type)}] = None\n`;
+        content += `    ${this.toSnakeCase(f.name)}: Optional[${this.mapPyType(f)}] = None\n`;
       }
       if (requiredFields.length === 0 && optionalFields.length === 0) content += '    pass\n';
       content += '\n';
@@ -96,7 +122,7 @@ export class PythonGenerator {
       const updateFields = model.fields.filter(f => !f.isId);
       content += `@dataclass\nclass ${name}UpdateInput:\n    """Typed data for updating an existing ${name} record."""\n`;
       for (const f of updateFields) {
-        content += `    ${this.toSnakeCase(f.name)}: Optional[${this.mapPyType(f.type)}] = None\n`;
+        content += `    ${this.toSnakeCase(f.name)}: Optional[${this.mapPyType(f)}] = None\n`;
       }
       if (updateFields.length === 0) content += '    pass\n';
       content += '\n';
@@ -126,7 +152,7 @@ export class PythonGenerator {
     pyContent += 'MODEL_TO_TABLE = {\n';
     for (const model of models) {
       const props = this.getAllPropertyVariations(model.name);
-      const fullTableName = `[${model.schemaName}].[${model.tableName}]`;
+      const fullTableName = bracketedTableName(model);
       for (const prop of props) {
         pyContent += `    "${prop}": "${fullTableName}",\n`;
       }
@@ -178,55 +204,54 @@ export class PythonGenerator {
     fs.writeFileSync(this.outputPath, pyContent);
   }
 
-  private mapPyType(fieldType: string): string {
-    const lower = fieldType.toLowerCase();
-    if (['int', 'integer', 'smallint', 'tinyint', 'bigint', 'number'].includes(lower)) {
-      return 'int';
+  /**
+   * The Python type for a field.
+   *
+   * From the declared type, so `DECIMAL` is a `float` and `BIGINT` stays an `int`:
+   * both arrived as `number` before and took the integer branch.
+   */
+  private mapPyType(field: Field): string {
+    switch (fieldKind(field, this.provider)) {
+      case 'int':
+      case 'bigint': return 'int';
+      case 'float': return 'float';
+      case 'bool': return 'bool';
+      case 'date': return 'datetime';
+      case 'bytes': return 'bytes';
+      case 'json': return 'Any';
+      case 'vector': return 'List[float]';
+      default: return 'str';
     }
-    if (['float', 'real', 'double', 'decimal', 'numeric', 'money'].includes(lower)) {
-      return 'float';
-    }
-    if (['bool', 'boolean', 'bit'].includes(lower)) {
-      return 'bool';
-    }
-    if (['datetime', 'datetime2', 'date', 'smalldatetime', 'datetimeoffset', 'timestamp'].includes(lower)) {
-      return 'datetime';
-    }
-    if (['bytes', 'binary', 'varbinary'].includes(lower)) {
-      return 'bytes';
-    }
-    return 'str';
   }
 
-  private generateModels(models: Model[], outputDir: string) {
+  private generateModelFile(model: Model, outputDir: string) {
+    // Single-entity file like dotnet `${model.name}.cs` / typescript `${model.name}.ts`.
+    // Contains the @dataclass entity + TypedDict row shapes for that model only.
     let content = '# This file is auto-generated. Do not edit directly.\n';
     content += 'from dataclasses import dataclass, field\n';
     content += 'from typing import Optional, List, Any, TypedDict\n';
     content += 'from datetime import datetime\n\n';
 
-    for (const model of models) {
-      if (model.description) {
-        content += `"""${model.description}"""\n`;
-      }
-      content += `@dataclass\nclass ${model.name}:\n`;
-
-      if (model.fields.length === 0 && model.relations.length === 0) {
-        content += '    pass\n\n';
-        continue;
-      }
+    if (model.description) {
+      content += `"""${model.description}"""\n`;
+    }
+    content += `@dataclass\nclass ${model.name}:\n`;
 
+    if (model.fields.length === 0 && model.relations.length === 0) {
+      content += '    pass\n\n';
+    } else {
       // Required fields first
       const required = model.fields.filter(f => !f.isOptional && !f.hasDefault);
       const optionals = model.fields.filter(f => f.isOptional || f.hasDefault);
 
       for (const f of required) {
-        const pyType = this.mapPyType(f.type);
+        const pyType = this.mapPyType(f);
         const snakeName = this.toSnakeCase(f.name);
         content += `    ${snakeName}: ${pyType}\n`;
       }
 
       for (const f of optionals) {
-        const pyType = this.mapPyType(f.type);
+        const pyType = this.mapPyType(f);
         const snakeName = this.toSnakeCase(f.name);
         content += `    ${snakeName}: Optional[${pyType}] = None\n`;
       }
@@ -256,7 +281,7 @@ export class PythonGenerator {
         content += '    pass\n';
       }
       for (const f of rowRequired) {
-        content += `    ${this.toSnakeCase(f.name)}: ${this.mapPyType(f.type)}\n`;
+        content += `    ${this.toSnakeCase(f.name)}: ${this.mapPyType(f)}\n`;
       }
       content += `\nclass ${model.name}Row(_${model.name}Required, total=False):\n`;
       content += `    """Row shape returned for ${model.name} queries."""\n`;
@@ -264,7 +289,7 @@ export class PythonGenerator {
         content += '    pass\n';
       }
       for (const f of rowOptional) {
-        content += `    ${this.toSnakeCase(f.name)}: ${this.mapPyType(f.type)}\n`;
+        content += `    ${this.toSnakeCase(f.name)}: ${this.mapPyType(f)}\n`;
       }
       for (const rel of model.relations) {
         const relName = this.toSnakeCase(rel.name);
@@ -273,6 +298,32 @@ export class PythonGenerator {
       content += '\n';
     }
 
+    fs.writeFileSync(path.join(outputDir, `${model.name}.py`), content);
+  }
+
+  private generateModelsIndex(models: Model[], outputDir: string) {
+    // Backward-compat aggregator: `from an5_models import User` keeps working.
+    // New code can also import directly: `from .User import User, UserRow`.
+    // Supports both package-relative (`python -m`) and top-level (`sys.path`
+    // pointing at the output dir) imports via try/except fallback.
+    let content = '# This file is auto-generated. Do not edit directly.\n';
+    content += '"""Backward-compat aggregator re-exporting per-model entity files."""\n';
+    for (const model of models) {
+      content += `try:\n`;
+      content += `    from .${model.name} import ${model.name}, ${model.name}Row, _${model.name}Required\n`;
+      content += `except ImportError:\n`;
+      content += `    from ${model.name} import ${model.name}, ${model.name}Row, _${model.name}Required\n`;
+    }
+    if (models.length > 0) {
+      content += '\n__all__ = [\n';
+      for (const model of models) {
+        content += `    "${model.name}", "${model.name}Row", "_${model.name}Required",\n`;
+      }
+      content += ']\n';
+    } else {
+      content += '\n__all__ = []\n';
+    }
+
     fs.writeFileSync(path.join(outputDir, 'an5_models.py'), content);
   }
 
@@ -281,23 +332,28 @@ export class PythonGenerator {
     content += 'import os\n';
     content += 'from typing import Dict, List, Optional, Any, Callable, TYPE_CHECKING\n\n';
 
-    content += 'try:\n';
-    content += '    from an5_adapter import An5Adapter, AdapterTableClient, create_an5_adapter, set_adapter_metadata\n';
-    content += 'except ImportError:\n';
-    content += '    from .an5_adapter import An5Adapter, AdapterTableClient, create_an5_adapter, set_adapter_metadata\n\n';
+    // Runtime adapter comes from the `an5-adapters` PyPI package
+    // (module `an5_adapter`). There is no local adapter file in the
+    // generated output dir, so no relative-import fallback here — a
+    // relative fallback would be unresolvable and trip Pylance
+    // `reportMissingImports` on every generated client.
+    content += 'from an5_adapter import An5Adapter, AdapterTableClient, create_an5_adapter, set_adapter_metadata\n\n';
 
+    const metadataModule = this.metadataModule();
     content += 'try:\n';
-    content += '    from .an5_metadata import MODEL_TO_TABLE, MODEL_FIELDS\n';
+    content += `    from .${metadataModule} import MODEL_TO_TABLE, MODEL_FIELDS\n`;
     content += 'except ImportError:\n';
-    content += '    from an5_metadata import MODEL_TO_TABLE, MODEL_FIELDS\n\n';
+    content += `    from ${metadataModule} import MODEL_TO_TABLE, MODEL_FIELDS\n\n`;
 
     if (models.length > 0) {
-      const rowTypes = models.map(m => `${m.name}Row`).join(', ');
       content += 'if TYPE_CHECKING:\n';
-      content += '    try:\n';
-      content += `        from an5_models import ${rowTypes}\n`;
-      content += '    except ImportError:\n';
-      content += `        from .an5_models import ${rowTypes}\n\n`;
+      for (const m of models) {
+        content += '    try:\n';
+        content += `        from .${m.name} import ${m.name}Row\n`;
+        content += '    except ImportError:\n';
+        content += `        from .an5_models import ${m.name}Row  # fallback aggregator\n`;
+      }
+      content += '\n';
     }
 
     content += 'class An5Client:\n';
@@ -340,7 +396,7 @@ export class PythonGenerator {
 
   private generateInit(models: Model[], outputDir: string) {
     let content = '# This file is auto-generated. Do not edit directly.\n';
-    content += 'from .an5_metadata import MODEL_TO_TABLE, MODEL_DESCRIPTIONS, MODEL_FIELDS, RELATION_MAP\n';
+    content += `from .${this.metadataModule()} import MODEL_TO_TABLE, MODEL_DESCRIPTIONS, MODEL_FIELDS, RELATION_MAP\n`;
     content += 'from .an5_models import *\n';
     content += 'from .an5_orm_types import (\n';
     content += '    StringFilter, IntFilter, NumberFilter, BoolFilter, DateTimeFilter,\n';