Merge pull request #956 from jupyter-naas/955-featapps-rebuild-apps-section-as-a-real-marketplace-with-installedavailable-modules

feat(apps): rebuild Apps section as a real marketplace

Author: jravenel

AGENTS.md

@@ -169,19 +169,33 @@ def unsupported_method(self, arg: str) -> None:
 
 After `abi stack start`, the web UI is at `http://localhost:3042`.
 
-Default admin credentials (set in `config.local.yaml` under `nexus_config.users`):
+Default admin credentials:
 
 | Email | Password |
 |---|---|
 | `admin@example.com` | `Admin1234!` |
 
 Password login is enabled via `auth_password_enabled: true` in `config.local.yaml`. Set it to `false` to switch back to magic link.
 
-If you see "Incorrect email or password", the Postgres volume may have been initialized with a different password. Reset it:
+**How the password is set:** On first boot, the seeder looks for `NEXUS_USER_ADMIN_EXAMPLE_COM_PASSWORD` in `.env`. If found, it uses that value. If missing, it generates a random password and writes it back to `.env`. The `.env` in this repo ships with `Admin1234!` pre-set, so all teammates get the same password as long as they don't delete that line.
 
+If you see "Incorrect email or password":
+
+**Option A (no data to keep):** Wipe and reseed.
+```bash
+docker volume rm abi_postgres_data
+abi stack start
+```
+
+**Option B (keep existing data):** The user already exists with a mismatched hash. Add the missing key to `.env` then force-update the hash:
 ```bash
-PG_PASS=$(grep POSTGRES_PASSWORD .env | cut -d= -f2)
-docker exec abi-postgres-1 psql -U abi -c "ALTER USER abi PASSWORD '$PG_PASS';"
+# 1. Add to .env if missing:
+echo "NEXUS_USER_ADMIN_EXAMPLE_COM_EMAIL=admin@example.com" >> .env
+echo "NEXUS_USER_ADMIN_EXAMPLE_COM_PASSWORD=Admin1234!" >> .env
+
+# 2. Reset the hash in Postgres directly:
+HASH=$(docker exec abi-abi-1 python3 -c "import bcrypt; print(bcrypt.hashpw(b'Admin1234!', bcrypt.gensalt()).decode())")
+docker exec abi-postgres-1 psql -U abi -d nexus -c "UPDATE users SET hashed_password='$HASH' WHERE email='admin@example.com';"
 docker compose restart abi
 ```
 

config.yaml

@@ -38,6 +38,12 @@ modules:
       nexus_config:
         database_url: "postgresql+asyncpg://{{ secret.POSTGRES_USER }}:{{ secret.POSTGRES_PASSWORD }}@localhost:5432/nexus"
         redis_url: "redis://localhost:6379/0"
+        marketplace:
+          pricing:
+            maintenance_standard_usd: 499
+            maintenance_early_access_usd: 299
+            cta_url: "https://naas.ai/enterprise"
+            enterprise_categories: ["domain"]
 
   - module: naas_abi_marketplace.ai.chatgpt
     enabled: true

libs/naas-abi-marketplace/naas_abi_marketplace/applications/agicap/agents/AgicapAgent.py

@@ -9,7 +9,7 @@
 
 NAME = "Agicap"
 DESCRIPTION = "Expert cash flow management and financial analysis agent with access to Agicap Integration tools."
-AVATAR_URL = "https://logo.clearbit.com/agicap.com"
+AVATAR_URL = "https://agicap.com/favicon.ico"
 SYSTEM_PROMPT = """<role>
 You are Agicap, an expert financial analyst and cash flow management specialist. You possess deep expertise in:
 </role>

libs/naas-abi-marketplace/naas_abi_marketplace/applications/pennylane/agents/PennylaneAgent.py

@@ -9,7 +9,7 @@
 DESCRIPTION = "A Pennylane Agent for managing accounting and financial operations."
 MODEL = "o3-mini"
 TEMPERATURE = 1
-AVATAR_URL = "https://logo.clearbit.com/pennylane.tech"
+AVATAR_URL = "https://www.pennylane.tech/favicon.ico"
 SYSTEM_PROMPT = """Tu es un agent Pennylane avec accès aux outils d'intégration Pennylane.
 Si tu n'as pas accès aux outils, demande à l'utilisateur de configurer son PENNYLANE_API_TOKEN dans le fichier .env.
 Sois toujours clair et professionnel dans ta communication en aidant les utilisateurs à gérer leurs données comptables.

libs/naas-abi-marketplace/naas_abi_marketplace/applications/postgres/agents/PostgresAgent.py

@@ -12,7 +12,7 @@
 DESCRIPTION = "A PostgreSQL Assistant for managing database operations."
 MODEL = "gpt-4"
 TEMPERATURE = 0
-AVATAR_URL = "https://logo.clearbit.com/postgresql.org"
+AVATAR_URL = "https://www.postgresql.org/media/img/about/press/elephant.png"
 SYSTEM_PROMPT = """
 ## Role
 You are a PostgreSQL Assistant with access to PostgresIntegration tools.

libs/naas-abi/naas_abi/__init__.py

@@ -30,6 +30,69 @@ def _initialize_nexus_service_registry() -> None:
         pass
 
 
+class ModelPricingEntry(BaseModel):
+    """LLM token cost for one model (USD per 1M tokens)."""
+
+    model_config = ConfigDict(extra="forbid")
+
+    input_per_million: float
+    output_per_million: float
+    label: str
+
+
+class MarketplaceUsageTier(BaseModel):
+    """A concrete usage scenario used to estimate monthly LLM token costs."""
+
+    model_config = ConfigDict(extra="forbid")
+
+    label: str
+    interactions: int
+    avg_tokens: int
+    description: str
+
+
+class MarketplacePricingConfig(BaseModel):
+    """Maintenance fee configuration (expert retainer, not a license)."""
+
+    model_config = ConfigDict(extra="forbid")
+
+    maintenance_standard_usd: int = 499
+    maintenance_early_access_usd: int = 299
+    cta_url: str = "https://naas.ai/enterprise"
+    enterprise_categories: list[str] = Field(default_factory=lambda: ["domain"])
+    input_output_ratio: float = 0.6
+
+
+class MarketplaceConfig(BaseModel):
+    """Full marketplace configuration surfaced to the frontend via /api/modules/config."""
+
+    model_config = ConfigDict(extra="forbid")
+
+    pricing: MarketplacePricingConfig = Field(default_factory=MarketplacePricingConfig)
+    usage_tiers: list[MarketplaceUsageTier] = Field(
+        default_factory=lambda: [
+            MarketplaceUsageTier(label="Starter",      interactions=50,    avg_tokens=2_000,  description="~2 queries/day"),
+            MarketplaceUsageTier(label="Professional", interactions=300,   avg_tokens=5_000,  description="~10 queries/day"),
+            MarketplaceUsageTier(label="Scale",        interactions=2_000, avg_tokens=10_000, description="~65 queries/day, team use"),
+        ]
+    )
+    model_pricing: dict[str, ModelPricingEntry] = Field(
+        default_factory=lambda: {
+            "gpt-4o":           ModelPricingEntry(input_per_million=2.50,  output_per_million=10.00, label="GPT-4o"),
+            "gpt-4o-mini":      ModelPricingEntry(input_per_million=0.15,  output_per_million=0.60,  label="GPT-4o mini"),
+            "gpt-4":            ModelPricingEntry(input_per_million=30.00, output_per_million=60.00, label="GPT-4"),
+            "gpt-3.5-turbo":    ModelPricingEntry(input_per_million=0.50,  output_per_million=1.50,  label="GPT-3.5 Turbo"),
+            "o1":               ModelPricingEntry(input_per_million=15.00, output_per_million=60.00, label="o1"),
+            "o3-mini":          ModelPricingEntry(input_per_million=1.10,  output_per_million=4.40,  label="o3-mini"),
+            "claude-opus":      ModelPricingEntry(input_per_million=15.00, output_per_million=75.00, label="Claude Opus"),
+            "claude-sonnet":    ModelPricingEntry(input_per_million=3.00,  output_per_million=15.00, label="Claude Sonnet"),
+            "claude-haiku":     ModelPricingEntry(input_per_million=0.25,  output_per_million=1.25,  label="Claude Haiku"),
+            "gemini-1.5-pro":   ModelPricingEntry(input_per_million=3.50,  output_per_million=10.50, label="Gemini 1.5 Pro"),
+            "gemini-1.5-flash": ModelPricingEntry(input_per_million=0.075, output_per_million=0.30,  label="Gemini Flash"),
+        }
+    )
+
+
 class TenantConfig(BaseModel):
     """Tenant branding surfaced to the browser (tab title, favicon, etc.)."""
 
@@ -242,6 +305,7 @@ class NexusConfig(BaseModel):
 
     tenant: TenantConfig = Field(default_factory=TenantConfig)
     feature_flags: FeatureFlagsConfig = Field(default_factory=FeatureFlagsConfig)
+    marketplace: MarketplaceConfig = Field(default_factory=MarketplaceConfig)
     users: list[UserSeedConfig] = Field(default_factory=list)
     organizations: list[OrganizationSeedConfig] = Field(default_factory=list)
 

libs/naas-abi/naas_abi/agents/AbiAgent.py

@@ -85,10 +85,10 @@ class AbiAgent(IntentAgent):
             "disabled": True,
         },
         {
-            "label": "Browse Apps",
+            "label": "Browse Marketplace",
             "value": "",
             "description": "Discover and enable modules from the marketplace",
-            "cta": "/apps",
+            "cta": "/marketplace",
         },
     ]
 

libs/naas-abi/naas_abi/apps/nexus/apps/api/app/api/router.py

@@ -19,6 +19,7 @@
 from naas_abi.apps.nexus.apps.api.app.services.auth.handlers import router as auth_router
 from naas_abi.apps.nexus.apps.api.app.services.chat.handlers import router as chat_router
 from naas_abi.apps.nexus.apps.api.app.services.files.handlers import router as files_router
+from naas_abi.apps.nexus.apps.api.app.services.modules.handlers import router as modules_router
 from naas_abi.apps.nexus.apps.api.app.services.providers.handlers import router as providers_router
 from naas_abi.apps.nexus.apps.api.app.services.workspaces.handlers import (
     router as workspaces_router,
@@ -39,6 +40,7 @@
 api_router.include_router(graph.router, prefix="/graph", tags=["graph"])
 api_router.include_router(view.router, prefix="/view", tags=["view"])
 api_router.include_router(agents_router, prefix="/agents", tags=["agents"])
+api_router.include_router(modules_router, prefix="/modules", tags=["modules"])
 api_router.include_router(files_router, prefix="/files", tags=["files"])
 api_router.include_router(secrets.router, prefix="/secrets", tags=["secrets"])
 api_router.include_router(providers_router, prefix="/providers", tags=["providers"])

libs/naas-abi/naas_abi/apps/nexus/apps/api/app/core/config.py

@@ -61,6 +61,98 @@ class ExternalAppConfig(BaseModel):
     icon_emoji: str | None = None
 
 
+class ModelPricingEntry(BaseModel):
+    """LLM token cost for one model (USD per 1M tokens, May 2026 rates)."""
+
+    model_config = ConfigDict(extra="forbid")
+
+    input_per_million: float
+    output_per_million: float
+    label: str
+
+
+class MarketplaceUsageTier(BaseModel):
+    """A concrete usage scenario used to estimate monthly LLM token costs."""
+
+    model_config = ConfigDict(extra="forbid")
+
+    label: str
+    interactions: int
+    avg_tokens: int
+    description: str
+
+
+class MarketplacePricingConfig(BaseModel):
+    """
+    Maintenance fee configuration for Enterprise-tier marketplace agents.
+
+    These are expert retainer fees — not software licenses. They fund the
+    AI engineers doing continuous domain knowledge curation, model migration,
+    ontology updates, and integration patching for each agent.
+    """
+
+    model_config = ConfigDict(extra="forbid")
+
+    # Standard rate (live, fully maintained agents)
+    maintenance_standard_usd: int = 499
+    # Early-access rate (preview agents, introductory pricing)
+    maintenance_early_access_usd: int = 299
+    # CTA URL for Subscribe / Early Access buttons
+    cta_url: str = "https://naas.ai/enterprise"
+    # Module categories considered Enterprise-maintained
+    enterprise_categories: list[str] = Field(default_factory=lambda: ["domain"])
+    # Token split between input (system prompt + context) and output (answer)
+    input_output_ratio: float = 0.6
+
+
+class MarketplaceConfig(BaseModel):
+    """Full marketplace configuration surfaced to the frontend via /api/modules/config."""
+
+    model_config = ConfigDict(extra="forbid")
+
+    pricing: MarketplacePricingConfig = Field(default_factory=MarketplacePricingConfig)
+
+    usage_tiers: list[MarketplaceUsageTier] = Field(
+        default_factory=lambda: [
+            MarketplaceUsageTier(
+                label="Starter",
+                interactions=50,
+                avg_tokens=2_000,
+                description="~2 queries/day",
+            ),
+            MarketplaceUsageTier(
+                label="Professional",
+                interactions=300,
+                avg_tokens=5_000,
+                description="~10 queries/day",
+            ),
+            MarketplaceUsageTier(
+                label="Scale",
+                interactions=2_000,
+                avg_tokens=10_000,
+                description="~65 queries/day, team use",
+            ),
+        ]
+    )
+
+    # Prices in USD per 1M tokens (May 2026 rates).
+    model_pricing: dict[str, ModelPricingEntry] = Field(
+        default_factory=lambda: {
+            "gpt-4o":           ModelPricingEntry(input_per_million=2.50,  output_per_million=10.00, label="GPT-4o"),
+            "gpt-4o-mini":      ModelPricingEntry(input_per_million=0.15,  output_per_million=0.60,  label="GPT-4o mini"),
+            "gpt-4":            ModelPricingEntry(input_per_million=30.00, output_per_million=60.00, label="GPT-4"),
+            "gpt-3.5-turbo":    ModelPricingEntry(input_per_million=0.50,  output_per_million=1.50,  label="GPT-3.5 Turbo"),
+            "o1":               ModelPricingEntry(input_per_million=15.00, output_per_million=60.00, label="o1"),
+            "o3-mini":          ModelPricingEntry(input_per_million=1.10,  output_per_million=4.40,  label="o3-mini"),
+            "claude-opus":      ModelPricingEntry(input_per_million=15.00, output_per_million=75.00, label="Claude Opus"),
+            "claude-sonnet":    ModelPricingEntry(input_per_million=3.00,  output_per_million=15.00, label="Claude Sonnet"),
+            "claude-haiku":     ModelPricingEntry(input_per_million=0.25,  output_per_million=1.25,  label="Claude Haiku"),
+            "gemini-1.5-pro":   ModelPricingEntry(input_per_million=3.50,  output_per_million=10.50, label="Gemini 1.5 Pro"),
+            "gemini-1.5-flash": ModelPricingEntry(input_per_million=0.075, output_per_million=0.30,  label="Gemini Flash"),
+        }
+    )
+
+
 FeatureKey = Literal["chat", "files", "agents", "knowledge", "settings"]
 
 
@@ -185,6 +277,9 @@ class Settings(BaseSettings):
     # Feature access policy consumed by workspace bootstrap responses
     feature_flags: FeatureFlagsConfig = Field(default_factory=FeatureFlagsConfig)
 
+    # Marketplace pricing, usage tiers, and model token costs
+    marketplace: MarketplaceConfig = Field(default_factory=MarketplaceConfig)
+
     # User seed configs (upserted by email on startup)
     users: list[UserSeedConfig] = Field(default_factory=list)
 

libs/naas-abi/naas_abi/apps/nexus/apps/api/app/main.py

@@ -27,6 +27,25 @@
 from starlette.middleware.base import BaseHTTPMiddleware
 
 
+async def _prefetch_modules_catalog() -> None:
+    """Warm up the marketplace module catalog in a thread-pool worker.
+
+    The catalog scans naas_abi_marketplace via filesystem I/O which is
+    synchronous.  Running it via run_in_executor keeps the event loop free.
+    """
+    _log = logging.getLogger(__name__)
+    try:
+        from naas_abi.apps.nexus.apps.api.app.services.modules.service import (
+            _build_catalog,
+        )
+
+        loop = asyncio.get_running_loop()
+        await loop.run_in_executor(None, _build_catalog)
+        _log.info("✓ Marketplace catalog pre-populated at startup")
+    except Exception:
+        _log.exception("Background modules catalog pre-fetch failed (non-fatal)")
+
+
 async def _prefetch_agent_class_registry() -> None:
     """Warm up the agent class registry in a thread-pool worker.
 
@@ -85,6 +104,9 @@ async def _startup(app: FastAPI) -> None:
     # for all agent modules to be imported.  create_task returns immediately.
     asyncio.create_task(_prefetch_agent_class_registry())
 
+    # Pre-populate the marketplace catalog so first GET /modules/ is instant.
+    asyncio.create_task(_prefetch_modules_catalog())
+
     # # Auto-start Ollama and pull default model (Qwen3-VL:2b for vision demos)
     # print("Checking Ollama status...")
     # # Gate autostart behind config flag to avoid process management in prod