Merge pull request #354 from CyberAgentAILab/feature/genai-edit-without-input

feat: add pinjected-genai package and type stubs

Author: proboscis

.serena/.gitignore

@@ -0,0 +1 @@
+/cache

packages/gcp/src/pinjected_gcp/__init__.py

@@ -8,13 +8,9 @@
 
 # Re-export commonly used items from auth
 from .auth import (
-    gcp_credentials,
     gcp_credentials_from_env,
     gcp_credentials_from_file,
     gcp_credentials_from_dict,
-    gcp_project_id,
-    gcp_project_id_from_env,
-    gcp_project_id_from_dict,
 )
 
 # Re-export from secrets
@@ -67,13 +63,9 @@
     "a_list_gcp_secrets",
     "a_upload_gcs",
     "auth",
-    "gcp_credentials",
     "gcp_credentials_from_dict",
     "gcp_credentials_from_env",
     "gcp_credentials_from_file",
-    "gcp_project_id",
-    "gcp_project_id_from_dict",
-    "gcp_project_id_from_env",
     "gcp_secret_manager_client",
     "gcp_secret_value",
     "gcp_secret_value_cached",
@@ -83,9 +75,4 @@
 ]
 
 # Combined design for all GCP functionality
-__design__ = (
-    design(logger=loguru.logger)
-    + auth.__design__
-    + secrets.__design__
-    + storage.__design__
-)
+__design__ = design(logger=loguru.logger)

packages/gcp/src/pinjected_gcp/auth/__init__.py

@@ -4,13 +4,11 @@
     gcp_credentials_from_file,
     gcp_credentials_from_dict,
     gcp_credentials_from_env,
-    gcp_credentials,
     __design__ as auth_design,
 )
 
 __all__ = [
     "auth_design",
-    "gcp_credentials",
     "gcp_credentials_from_dict",
     "gcp_credentials_from_env",
     "gcp_credentials_from_file",

packages/gcp/src/pinjected_gcp/auth/credentials.py

@@ -9,7 +9,6 @@
 from google.auth.credentials import Credentials
 from loguru import logger
 from pinjected import design, instance
-from pinjected.di.iproxy import IProxy
 
 
 @instance
@@ -37,7 +36,7 @@ def gcp_service_account_dict_from_file(
 @instance
 def gcp_credentials_from_file(
     gcp_service_account_path: Path,
-    gcp_scopes: list[str],
+    # gcp_scopes: list[str],
 ) -> Credentials:
     """
     Create GCP credentials from a service account JSON file.
@@ -57,7 +56,7 @@ def gcp_credentials_from_file(
     logger.info(f"Loading GCP credentials from {gcp_service_account_path}")
     return service_account.Credentials.from_service_account_file(
         str(gcp_service_account_path),
-        scopes=gcp_scopes,
+        # scopes=gcp_scopes,
     )
 
 
@@ -150,7 +149,7 @@ def gcp_project_id_from_env() -> str:
 
 
 # Default scopes
-default_gcp_scopes = IProxy.bind(["https://www.googleapis.com/auth/cloud-platform"])
+default_gcp_scopes = ["https://www.googleapis.com/auth/cloud-platform"]
 
 # Design for auth module
 __design__ = design(

packages/gcp/src/pinjected_gcp/auth/credentials.pyi

@@ -0,0 +1,13 @@
+from typing import Any, Dict
+from google.oauth2.credentials import Credentials
+from pinjected import IProxy
+
+default_gcp_scopes: Any
+__design__: Any
+
+gcp_service_account_dict_from_file: IProxy[Dict[str, Any]]
+gcp_credentials_from_file: IProxy[Credentials]
+gcp_credentials_from_dict: IProxy[Credentials]
+gcp_credentials_from_env: IProxy[Credentials]
+gcp_project_id_from_dict: IProxy[str]
+gcp_project_id_from_env: IProxy[str]

packages/pinjected-genai/README.md

@@ -0,0 +1,28 @@
+# pinjected-genai
+
+Google GenAI (Gemini) bindings for the pinjected library.
+
+## Features
+
+- Seamless integration with Google GenAI SDK
+- Support for Gemini 2.0 Flash image generation
+- Async support with @injected decorators
+- Rate limiting and retry logic
+
+## Installation
+
+```bash
+pip install pinjected-genai
+```
+
+## Usage
+
+```python
+from pinjected_genai import genai_client, generate_image
+
+# Use with dependency injection
+@injected
+async def my_function(generate_image, /):
+    result = await generate_image("A cute baby turtle in 3D art style")
+    return result
+```

packages/pinjected-genai/pyproject.toml

@@ -0,0 +1,61 @@
+[build-system]
+requires = ["hatchling==1.26.3"]
+build-backend = "hatchling.build"
+
+[project]
+name = "pinjected-genai"
+version = "0.1.0"
+description = "Google Vertex AI (Gemini) bindings for pinjected library"
+readme = "README.md"
+requires-python = ">=3.10"
+license = "MIT"
+authors = [
+    { name = "Kento Masui", email = "nameissoap@gmail.com" }
+]
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+]
+
+dependencies = [
+    "pinjected",
+    "pinjected-gcp",
+    "google-genai>=0.1.0",
+    "google-auth>=2.0.0",
+    "injected-utils>=0.1.32",
+    "pillow",
+    "loguru",
+    "filelock",
+    "reactivex>=4.0.4",
+    "pinjected-rate-limit>=0.1.0",
+    "tenacity>=9.0.0",
+]
+
+[tool.hatch.metadata]
+allow-direct-references = true
+
+[tool.hatch.build.targets.wheel]
+packages = ["src/pinjected_genai"]
+
+[tool.pytest.ini_options]
+pythonpath = ["src/pinjected_genai"]
+asyncio_mode = "strict"
+asyncio_default_fixture_loop_scope = "function"
+markers = [
+    "integration: marks tests as integration tests (deselect with '-m \"not integration\"')",
+    "visual: marks tests for visual verification of generated images (run with --no-skip)",
+]
+
+[tool.uv.sources]
+pinjected = { workspace = true }
+pinjected-gcp = { workspace = true }
+injected-utils = { workspace = true }
+pinjected-rate-limit = { workspace = true }
+
+[dependency-groups]
+dev = [
+    "pytest>=8.1.1,<9",
+    "pytest-asyncio>=0.24.0",
+    "matplotlib>=3.5.0",
+]

packages/pinjected-genai/src/__init__.py

@@ -0,0 +1,39 @@
+from pathlib import Path
+
+from pinjected_genai.clients import (
+    GenAIAuthClient,
+    genai_auth_client,
+    genai_auth_client_adc,
+    genai_client,
+    genai_location,
+    genai_model_name,
+)
+from pinjected_genai.image_generation import (
+    GeneratedImage,
+    GenerationResult,
+    a_describe_image__genai,
+    a_edit_image__genai,
+    a_generate_image__genai,
+)
+
+from pinjected import *
+
+__version__ = "0.1.0"
+
+__all__ = [
+    "GenAIAuthClient",
+    "GeneratedImage",
+    "GenerationResult",
+    "a_describe_image__genai",
+    "a_edit_image__genai",
+    "a_generate_image__genai",
+    "genai_auth_client",
+    "genai_auth_client_adc",
+    "genai_client",
+    "genai_location",
+    "genai_model_name",
+]
+
+default_design = design(
+    cache_root_path=Path("~/.cache/pinjected_genai").expanduser(),
+)

packages/pinjected-genai/src/pinjected_genai/__init__.py

@@ -0,0 +1,88 @@
+from dataclasses import dataclass
+
+from google import genai
+from google.auth import default
+from google.auth.credentials import Credentials
+from loguru import logger
+
+from pinjected import instance
+
+
+@dataclass
+class GenAIAuthClient:
+    """Authentication client for Google Gen AI with Vertex AI support."""
+
+    credentials: Credentials
+    project_id: str
+    location: str = "global"
+
+    def create_client(self) -> genai.Client:
+        """Create a Gen AI client with Vertex AI and ADC support."""
+        # Use vertexai=True to enable Vertex AI mode with ADC
+        client = genai.Client(
+            vertexai=True,
+            project=self.project_id,
+            location=self.location,
+            credentials=self.credentials,
+        )
+        logger.info(
+            f"Created Gen AI client with Vertex AI mode for project {self.project_id} "
+            f"in {self.location}"
+        )
+        return client
+
+
+@instance
+def genai_auth_client_adc() -> GenAIAuthClient:
+    """Default Gen AI auth client using Application Default Credentials."""
+    logger.info("Creating Gen AI auth client using Application Default Credentials")
+    credentials, project = default()
+
+    if not project:
+        raise ValueError(
+            "Could not determine GCP project ID from Application Default Credentials. "
+            "Please set GOOGLE_CLOUD_PROJECT environment variable or use gcloud config."
+        )
+
+    logger.info(f"Using ADC with project: {project}")
+    return GenAIAuthClient(credentials=credentials, project_id=project)
+
+
+@instance
+def genai_auth_client(
+    genai_auth_client_adc: GenAIAuthClient,
+    genai_location: str,
+) -> GenAIAuthClient:
+    """Gen AI authentication client - default uses ADC, can be overridden via injection."""
+    # Update location from injection
+    genai_auth_client_adc.location = genai_location
+    return genai_auth_client_adc
+
+
+@instance
+def genai_location() -> str:
+    """Default GCP location for Gen AI API.
+
+    Note: Gemini 2.5 Flash Image Preview (nano-banana) is only available
+    on the global endpoint, not regional endpoints.
+    """
+    return "global"
+
+
+@instance
+def genai_client(
+    genai_auth_client: GenAIAuthClient,
+) -> genai.Client:
+    """Singleton Gen AI client with Vertex AI and ADC support."""
+    client = genai_auth_client.create_client()
+    logger.info(
+        f"Created Gen AI client for project {genai_auth_client.project_id} "
+        f"in {genai_auth_client.location}"
+    )
+    return client
+
+
+@instance
+def genai_model_name() -> str:
+    """Default model name for image generation (nano-banana)."""
+    return "gemini-2.5-flash-image-preview"