Merge branch 'main' into feat/dockerize

Author: shubham3121

backend/MIGRATIONS.md

@@ -1,6 +1,6 @@
 # Database Migrations Guide
 
-This guide explains how to work with database migrations in SyftAI Server. Whether you're new to migrations or just new to this project, this document will help you get started.
+This guide explains how to work with database migrations in Syft Space. Whether you're new to migrations or just new to this project, this document will help you get started.
 
 ## What Are Migrations?
 

backend/README.md

@@ -1,4 +1,4 @@
-# Syft AI Server
+# Syft Space
 
 A powerful RAG (Retrieval-Augmented Generation) platform that enables you to create, manage, and query AI-powered endpoints backed by vector databases and language models.
 

backend/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "syftai_space"
 version = "0.1.0"
-description = "Syft AI Server Backend API"
+description = "Syft Space Backend API"
 authors = [
     {name = "OpenMined", email = "support@openmined.org"}
 ]

backend/syftai_space/components/__init__.py

@@ -1 +1 @@
-"""Components package for syftai-server."""
+"""Components package for Syft Space."""

backend/syftai_space/components/auth/middleware.py

@@ -18,7 +18,7 @@ class AdminKeyMiddleware(BaseHTTPMiddleware):
     All other routes require Authorization: Bearer <key> header.
     """
 
-    STATIC_PUBLIC_PATHS = ["/docs", "/redoc", "/openapi.json", "/syftai-server"]
+    STATIC_PUBLIC_PATHS = ["/docs", "/redoc", "/openapi.json", "/frontend"]
     STATIC_PUBLIC_EXACT = ["/"]
 
     async def dispatch(

backend/syftai_space/components/endpoints/handlers.py

@@ -587,7 +587,6 @@ def _publish_to_marketplace(
                     for policy in endpoint.policies
                 ]
                 connection_config = {
-                    "host": "localhost:8080",
                     "path": f"/api/v1/endpoints/{endpoint.slug}/query",
                 }
 

backend/syftai_space/components/policy_types/accounting/accounting_type.py

@@ -182,6 +182,7 @@ def pre_hook(
             credentials = AccountingCredentials.from_context(context)
             amount = config.price
 
+            transaction = None
             try:
                 transaction = self._create_transaction(
                     credentials,
@@ -193,6 +194,9 @@ def pre_hook(
                 transactions.append({"id": transaction.id, "amount": amount})
                 total_amount += amount
             except Exception as e:
+                if transaction:
+                    self._cancel_transaction(credentials, transaction.id)
+
                 raise PolicyViolationError(
                     message=f"Failed to create accounting transaction: {e}",
                     policy_type=self.NAME,
@@ -221,7 +225,7 @@ def _create_transaction(
         return accounting_client.create_delegated_transaction(
             senderEmail=sender_email,
             amount=amount,
-            transaction_token=transaction_token,
+            token=transaction_token,
             appEpPath=endpoint_slug,
         )
 
@@ -259,6 +263,9 @@ def post_hook(
             try:
                 self._confirm_transaction(credentials, transaction["id"])
             except Exception as e:
+                if transaction.get("id"):
+                    self._cancel_transaction(credentials, transaction["id"])
+
                 raise PolicyViolationError(
                     message=f"Failed to confirm accounting transaction: {e}",
                     policy_type=self.NAME,
@@ -277,6 +284,17 @@ def post_hook(
 
         return context
 
+    def _cancel_transaction(
+        self, credentials: AccountingCredentials, transaction_id: str
+    ) -> None:
+        """Cancel a transaction with the accounting service."""
+        accounting_client = UserClient(
+            url=str(credentials.url),
+            email=str(credentials.email),
+            password=credentials.password,
+        )
+        accounting_client.cancel_transaction(id=transaction_id)
+
     def _confirm_transaction(
         self, credentials: AccountingCredentials, transaction_id: str
     ) -> None:

backend/syftai_space/components/settings/entities.py

@@ -12,6 +12,6 @@ class Settings(SQLModel, table=True):
 
     id: int = Field(default=1, primary_key=True)
     public_url: str | None = Field(
-        default=None, description="Public URL for the SyftAI Space"
+        default=None, description="Public URL for the Syft Space"
     )
     updated_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))

backend/syftai_space/components/settings/handlers.py

@@ -1,14 +1,15 @@
 """Settings handlers for business logic."""
 
 from fastapi import HTTPException
+from loguru import logger
 from pydantic import HttpUrl
 
 from syftai_space.components.marketplaces.handlers import MarketplaceHandler
 from syftai_space.components.settings.repository import SettingsRepository
 from syftai_space.components.settings.schemas import PublicUrlResponse
 from syftai_space.components.shared.syfthub_client import SyftHubClient, SyftHubError
 from syftai_space.components.tenants.entities import Tenant
-from syftai_space.config import AppSettings
+from syftai_space.config import app_settings
 
 
 class SettingsHandler:
@@ -18,7 +19,6 @@ def __init__(
         self,
         settings_repository: SettingsRepository,
         marketplace_handler: MarketplaceHandler,
-        config: AppSettings,
     ) -> None:
         """Initialize the settings handler.
 
@@ -29,7 +29,6 @@ def __init__(
         """
         self.settings_repository = settings_repository
         self.marketplace_handler = marketplace_handler
-        self.config = config
 
     def get_public_url(self) -> PublicUrlResponse:
         """Get the current public URL from database (source of truth).
@@ -66,6 +65,9 @@ def update_public_url(
         # Sync to SyftHub if marketplace is configured
         try:
             marketplace = self.marketplace_handler.get_default_marketplace(tenant)
+            logger.info(
+                f"Updating public URL to {url_str} for marketplace {marketplace.url}"
+            )
             with SyftHubClient(str(marketplace.url)) as syfthub:
                 syfthub.login(marketplace.email, marketplace.password)
                 syfthub.update_profile(domain=url_str)
@@ -81,12 +83,16 @@ def update_public_url(
                 detail=f"Failed to sync public URL to marketplace: {e.message}",
             ) from e
 
+        app_settings.public_url = HttpUrl(url_str) if url_str else None
         return PublicUrlResponse(public_url=url_str)
 
-    def initialize_from_config(self) -> None:
+    def initialize_from_config(self, tenants: list[Tenant]) -> None:
         """Initialize settings from config on startup.
 
         If SYFT_PUBLIC_URL env var is set, it overwrites the database value.
         """
-        if self.config.public_url:
-            self.settings_repository.update_public_url(str(self.config.public_url))
+        if not app_settings.public_url:
+            return
+
+        for tenant in tenants:
+            self.update_public_url(tenant, app_settings.public_url)

backend/syftai_space/components/shared/__init__.py

@@ -1,4 +1,4 @@
-"""Shared utilities and types for syftai-server."""
+"""Shared utilities and types for Syft Space."""
 
 from .syfthub_client import SyftHubClient