refactoring + ydb-python-sdk

Author: asmyasnikov

Makefile

@@ -25,19 +25,22 @@ SQLC_PROTOS  := $(SQLC_MOD_DIR)/protos
 PROTO_IN     := $(SQLC_PROTOS)/plugin/codegen.proto
 PROTO_OUT    = $(REPO_ROOT)internal/codegen/pb
 PBOUT        = $(PROTO_OUT)/codegen.pb.go
-ENGINE_BIN   = $(BINDIR)/sqlc-engine-ydb
-CODEGEN_BIN  = $(BINDIR)/sqlc-gen-ydb-go-sdk
-CODEGEN_DBSQL_BIN = $(BINDIR)/sqlc-gen-ydb-database-sql
+
+# Binaries
+SQLC_ENGINE_YDB_BIN          = $(BINDIR)/sqlc-engine-ydb
+CODEGEN_YDB_GO_SDK_BIN       = $(BINDIR)/sqlc-gen-ydb-go-sdk
+CODEGEN_YDB_DATABASE_SQL_BIN = $(BINDIR)/sqlc-gen-ydb-database-sql
+CODEGEN_YDB_PYTHON_SDK_BIN   = $(BINDIR)/sqlc-gen-ydb-python-sdk
 
 # Example dirs under examples/ (each has schema.sql, queries.sql, sqlc.yaml with all plugins).
-# Codegen output: examples/<name>/<plugin>/ (e.g. authors/ydb-go-sdk, authors/ydb-database-sql).
+# Codegen output: examples/<name>/<plugin>/ (e.g. authors/ydb-go-sdk, authors/ydb-database-sql, authors/ydb-python-sdk).
 # To add an example: create examples/<name>/{schema.sql,queries.sql,sqlc.yaml} and add <name> to EXAMPLES.
 EXAMPLES        ?= authors album kv batch booktest jets ondeck
-PLUGIN_OUTPUTS  := ydb-go-sdk ydb-database-sql
+PLUGIN_OUTPUTS  := ydb-go-sdk ydb-database-sql ydb-python-sdk
 
 DOCKER_IMAGE ?= sqlc-ydb
 
-.PHONY: all proto build build-engine build-codegen build-codegen-dbsql build-sqlc examples docker-build clean help
+.PHONY: all proto build build-engine build-codegen build-codegen-dbsql build-codegen-pysdk build-sqlc examples docker-build clean help
 
 all: help
 
@@ -47,7 +50,8 @@ help:
 	@echo "  build-engine  - build sqlc-engine-ydb into $(BINDIR)/"
 	@echo "  build-codegen - build sqlc-gen-ydb-go-sdk into $(BINDIR)/ (depends on proto)"
 	@echo "  build-codegen-dbsql - build sqlc-gen-ydb-database-sql into $(BINDIR)/ (depends on proto)"
-	@echo "  build         - proto + build both plugins (ydb-go-sdk + ydb-database-sql)"
+	@echo "  build-codegen-pysdk - build sqlc-gen-ydb-python-sdk into $(BINDIR)/ (depends on proto)"
+	@echo "  build         - proto + build all plugins (ydb-go-sdk, ydb-database-sql, ydb-python-sdk)"
 	@echo "  build-sqlc    - build sqlc from ../engine-plugin into $(BINDIR)/sqlc (needed for examples)"
 	@echo "  examples      - run 'sqlc generate' in each example (EXAMPLES=$(EXAMPLES)); outputs: $(PLUGIN_OUTPUTS)"
 	@echo "  docker-build  - build Docker image with sqlc + plugins (DOCKER_IMAGE=$(DOCKER_IMAGE))"
@@ -76,21 +80,26 @@ $(PBOUT): $(PROTO_IN)
 
 # Build the YDB engine plugin (parses schema + queries).
 build-engine: $(BINDIR)
-	go build -o $(ENGINE_BIN) ./cmd/sqlc-engine-ydb/
-	@echo "ok: $(ENGINE_BIN)"
+	go build -o $(SQLC_ENGINE_YDB_BIN) ./cmd/sqlc-engine-ydb/
+	@echo "ok: $(SQLC_ENGINE_YDB_BIN)"
 
 # Build the ydb-go-sdk codegen plugin. Requires proto.
 build-codegen: proto $(BINDIR)
-	go build -o $(CODEGEN_BIN) ./cmd/sqlc-gen-ydb-go-sdk/
-	@echo "ok: $(CODEGEN_BIN)"
+	go build -o $(CODEGEN_YDB_GO_SDK_BIN) ./cmd/sqlc-gen-ydb-go-sdk/
+	@echo "ok: $(CODEGEN_YDB_GO_SDK_BIN)"
 
 # Build the ydb-database-sql codegen plugin. Requires proto.
 build-codegen-dbsql: proto $(BINDIR)
-	go build -o $(CODEGEN_DBSQL_BIN) ./cmd/sqlc-gen-ydb-database-sql/
-	@echo "ok: $(CODEGEN_DBSQL_BIN)"
+	go build -o $(CODEGEN_YDB_DATABASE_SQL_BIN) ./cmd/sqlc-gen-ydb-database-sql/
+	@echo "ok: $(CODEGEN_YDB_DATABASE_SQL_BIN)"
+
+# Build the ydb-python-sdk codegen plugin. Requires proto.
+build-codegen-pysdk: proto $(BINDIR)
+	go build -o $(CODEGEN_YDB_PYTHON_SDK_BIN) ./cmd/sqlc-gen-ydb-python-sdk/
+	@echo "ok: $(CODEGEN_YDB_PYTHON_SDK_BIN)"
 
-# Build both plugins (ydb-go-sdk + ydb-database-sql).
-build: build-engine build-codegen build-codegen-dbsql
+# Build all plugins (ydb-go-sdk, ydb-database-sql, ydb-python-sdk).
+build: build-engine build-codegen build-codegen-dbsql build-codegen-pysdk
 	@echo "Plugins ready in $(BINDIR)/"
 
 # Build sqlc from engine-plugin into BINDIR (so examples use plugin-aware sqlc).

cmd/sqlc-gen-ydb-database-sql/main.go

@@ -10,7 +10,7 @@ import (
 	"io"
 	"os"
 
-	"github.com/sqlc-dev/sqlc-engine-ydb/internal/codegen/dbsql"
+	"github.com/sqlc-dev/sqlc-engine-ydb/internal/codegen"
 	"github.com/sqlc-dev/sqlc-engine-ydb/internal/codegen/pb"
 	"google.golang.org/protobuf/proto"
 )
@@ -31,7 +31,7 @@ func run(ctx context.Context) error {
 	if err := proto.Unmarshal(reqBlob, &req); err != nil {
 		return fmt.Errorf("unmarshal request: %w", err)
 	}
-	resp, err := dbsql.Generate(ctx, &req)
+	resp, err := codegen.Generate(ctx, &req, codegen.DatabaseSQL)
 	if err != nil {
 		return err
 	}

cmd/sqlc-gen-ydb-go-sdk/main.go

@@ -10,8 +10,8 @@ import (
 	"io"
 	"os"
 
+	"github.com/sqlc-dev/sqlc-engine-ydb/internal/codegen"
 	"github.com/sqlc-dev/sqlc-engine-ydb/internal/codegen/pb"
-	"github.com/sqlc-dev/sqlc-engine-ydb/internal/codegen/ydb"
 	"google.golang.org/protobuf/proto"
 )
 
@@ -31,7 +31,7 @@ func run(ctx context.Context) error {
 	if err := proto.Unmarshal(reqBlob, &req); err != nil {
 		return fmt.Errorf("unmarshal request: %w", err)
 	}
-	resp, err := ydb.Generate(ctx, &req)
+	resp, err := codegen.Generate(ctx, &req, codegen.YdbGoSDK)
 	if err != nil {
 		return err
 	}

cmd/sqlc-gen-ydb-python-sdk/main.go

@@ -0,0 +1,47 @@
+// sqlc-gen-ydb-python-sdk is a process-based codegen plugin for sqlc (v2 config).
+// It generates Python code for ydb-python-sdk (QuerySessionPool, execute_with_retries, $name params).
+// Reads binary GenerateRequest from stdin, writes binary GenerateResponse to stdout.
+package main
+
+import (
+	"bufio"
+	"context"
+	"fmt"
+	"io"
+	"os"
+
+	"github.com/sqlc-dev/sqlc-engine-ydb/internal/codegen"
+	"github.com/sqlc-dev/sqlc-engine-ydb/internal/codegen/pb"
+	"google.golang.org/protobuf/proto"
+)
+
+func main() {
+	if err := run(context.Background()); err != nil {
+		fmt.Fprintf(os.Stderr, "sqlc-gen-ydb-python-sdk: %v\n", err)
+		os.Exit(2)
+	}
+}
+
+func run(ctx context.Context) error {
+	reqBlob, err := io.ReadAll(os.Stdin)
+	if err != nil {
+		return err
+	}
+	var req pb.GenerateRequest
+	if err := proto.Unmarshal(reqBlob, &req); err != nil {
+		return fmt.Errorf("unmarshal request: %w", err)
+	}
+	resp, err := codegen.Generate(ctx, &req, codegen.YdbPythonSDK)
+	if err != nil {
+		return err
+	}
+	respBlob, err := proto.Marshal(resp)
+	if err != nil {
+		return fmt.Errorf("marshal response: %w", err)
+	}
+	w := bufio.NewWriter(os.Stdout)
+	if _, err := w.Write(respBlob); err != nil {
+		return err
+	}
+	return w.Flush()
+}

examples/album/sqlc.yaml

@@ -12,6 +12,9 @@ plugins:
   - name: ydb-database-sql
     process:
       cmd: sqlc-gen-ydb-database-sql
+  - name: ydb-python-sdk
+    process:
+      cmd: sqlc-gen-ydb-python-sdk
 
 sql:
   - engine: ydb
@@ -26,3 +29,7 @@ sql:
         plugin: ydb-database-sql
         options:
           package: db
+      - out: ydb-python-sdk
+        plugin: ydb-python-sdk
+        options:
+          package: db