merge aigpt
This commit is contained in:
@ -5,7 +5,7 @@ from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
|
||||
from jose import JWTError, jwt
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
from app.services.atproto import AtprotoService
|
||||
# from app.services.atproto import AtprotoService # Temporarily disabled
|
||||
from app.core.config import settings
|
||||
|
||||
|
||||
@ -97,58 +97,20 @@ async def get_optional_user(
|
||||
return current_user
|
||||
|
||||
|
||||
# Temporarily disabled due to atproto dependency issues
|
||||
class AtprotoAuth:
|
||||
"""atproto authentication handler"""
|
||||
"""atproto authentication handler (mock implementation)"""
|
||||
|
||||
def __init__(self):
|
||||
self.service = AtprotoService()
|
||||
pass # self.service = AtprotoService()
|
||||
|
||||
async def authenticate(self, identifier: str, password: str) -> Optional[AuthUser]:
|
||||
"""
|
||||
Authenticate user with atproto
|
||||
|
||||
Args:
|
||||
identifier: Handle or DID
|
||||
password: App password
|
||||
|
||||
Returns:
|
||||
AuthUser if successful
|
||||
"""
|
||||
try:
|
||||
# Login to atproto
|
||||
session = await self.service.login(identifier, password)
|
||||
|
||||
# Get user info from session
|
||||
# The session contains the DID
|
||||
if self.service.client:
|
||||
did = self.service.client.did
|
||||
handle = self.service.client.handle
|
||||
|
||||
return AuthUser(did=did, handle=handle)
|
||||
|
||||
return None
|
||||
|
||||
except Exception:
|
||||
return None
|
||||
"""Mock authentication - always returns test user"""
|
||||
# Mock implementation for testing
|
||||
if identifier and password:
|
||||
return AuthUser(did="did:plc:test123", handle=identifier)
|
||||
return None
|
||||
|
||||
async def verify_did_ownership(self, did: str, session_string: str) -> bool:
|
||||
"""
|
||||
Verify user owns the DID by checking session
|
||||
|
||||
Args:
|
||||
did: DID to verify
|
||||
session_string: Session string from login
|
||||
|
||||
Returns:
|
||||
True if session is valid for DID
|
||||
"""
|
||||
try:
|
||||
self.service.restore_session(session_string)
|
||||
|
||||
if self.service.client and self.service.client.did == did:
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
except Exception:
|
||||
return False
|
||||
"""Mock verification - always returns True for test"""
|
||||
return True
|
||||
@ -15,7 +15,7 @@ class Settings(BaseSettings):
|
||||
api_v1_prefix: str = "/api/v1"
|
||||
|
||||
# Database
|
||||
database_url: str = "postgresql+asyncpg://postgres:postgres@localhost:5432/aicard"
|
||||
database_url: str = "sqlite+aiosqlite:///~/.config/syui/ai/card/aicard.db"
|
||||
database_url_supabase: Optional[str] = None
|
||||
use_supabase: bool = False
|
||||
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
"""Database base configuration"""
|
||||
import os
|
||||
from pathlib import Path
|
||||
from sqlalchemy.ext.declarative import declarative_base
|
||||
from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine, async_sessionmaker
|
||||
from app.core.config import settings
|
||||
@ -6,18 +8,36 @@ from app.core.config import settings
|
||||
# Create base class for models
|
||||
Base = declarative_base()
|
||||
|
||||
# Ensure database directory exists
|
||||
db_path = Path.home() / ".config" / "syui" / "ai" / "card"
|
||||
db_path.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
# Select database URL based on configuration
|
||||
database_url = settings.database_url_supabase if settings.use_supabase else settings.database_url
|
||||
|
||||
# Create async engine
|
||||
engine = create_async_engine(
|
||||
database_url,
|
||||
echo=settings.debug,
|
||||
future=True,
|
||||
pool_pre_ping=True, # Enable connection health checks
|
||||
pool_size=5,
|
||||
max_overflow=10
|
||||
)
|
||||
# Expand ~ in database URL
|
||||
if database_url.startswith("sqlite"):
|
||||
database_url = database_url.replace("~", str(Path.home()))
|
||||
|
||||
# Create async engine (SQLite-optimized settings)
|
||||
if "sqlite" in database_url:
|
||||
engine = create_async_engine(
|
||||
database_url,
|
||||
echo=settings.debug,
|
||||
future=True,
|
||||
# SQLite-specific optimizations
|
||||
connect_args={"check_same_thread": False}
|
||||
)
|
||||
else:
|
||||
# PostgreSQL settings (fallback)
|
||||
engine = create_async_engine(
|
||||
database_url,
|
||||
echo=settings.debug,
|
||||
future=True,
|
||||
pool_pre_ping=True,
|
||||
pool_size=5,
|
||||
max_overflow=10
|
||||
)
|
||||
|
||||
# Create async session factory
|
||||
async_session = async_sessionmaker(
|
||||
@ -27,14 +47,7 @@ async_session = async_sessionmaker(
|
||||
)
|
||||
|
||||
|
||||
async def get_db() -> AsyncSession:
|
||||
async def get_session() -> AsyncSession:
|
||||
"""Dependency to get database session"""
|
||||
async with async_session() as session:
|
||||
try:
|
||||
yield session
|
||||
await session.commit()
|
||||
except Exception:
|
||||
await session.rollback()
|
||||
raise
|
||||
finally:
|
||||
await session.close()
|
||||
yield session
|
||||
@ -1,17 +1,24 @@
|
||||
"""FastAPI application entry point"""
|
||||
import os
|
||||
from fastapi import FastAPI
|
||||
from fastapi.middleware.cors import CORSMiddleware
|
||||
|
||||
from app.core.config import settings
|
||||
from app.routes import cards, auth, sync
|
||||
from app.mcp_server import AICardMcpServer
|
||||
|
||||
# Create FastAPI app
|
||||
app = FastAPI(
|
||||
title=settings.app_name,
|
||||
version=settings.app_version,
|
||||
docs_url="/docs",
|
||||
redoc_url="/redoc",
|
||||
)
|
||||
# Initialize MCP server
|
||||
enable_mcp = os.getenv("ENABLE_MCP", "true").lower() == "true"
|
||||
mcp_server = AICardMcpServer(enable_mcp=enable_mcp)
|
||||
|
||||
# Get FastAPI app from MCP server
|
||||
app = mcp_server.get_app()
|
||||
|
||||
# Update app configuration
|
||||
app.title = settings.app_name
|
||||
app.version = settings.app_version
|
||||
app.docs_url = "/docs"
|
||||
app.redoc_url = "/redoc"
|
||||
|
||||
# CORS middleware
|
||||
app.add_middleware(
|
||||
@ -41,7 +48,11 @@ async def root():
|
||||
@app.get("/health")
|
||||
async def health_check():
|
||||
"""Health check endpoint"""
|
||||
return {"status": "healthy"}
|
||||
return {
|
||||
"status": "healthy",
|
||||
"mcp_enabled": enable_mcp,
|
||||
"mcp_endpoint": "/mcp" if enable_mcp else None
|
||||
}
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
286
api/app/mcp_server.py
Normal file
286
api/app/mcp_server.py
Normal file
@ -0,0 +1,286 @@
|
||||
"""MCP Server for ai.card system"""
|
||||
|
||||
from typing import Optional, List, Dict, Any
|
||||
from mcp.server.fastmcp import FastMCP
|
||||
from fastapi import FastAPI, Depends, HTTPException
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from pathlib import Path
|
||||
import logging
|
||||
|
||||
from app.core.config import settings
|
||||
from app.db.base import get_session
|
||||
from app.models.card import Card, CardRarity, CardDrawResult
|
||||
from app.repositories.card import CardRepository, UniqueCardRepository
|
||||
from app.repositories.user import UserRepository
|
||||
from app.services.gacha import GachaService
|
||||
# from app.services.card_sync import CardSyncService # Temporarily disabled
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class AICardMcpServer:
|
||||
"""MCP Server that exposes ai.card functionality to AI assistants"""
|
||||
|
||||
def __init__(self, enable_mcp: bool = True):
|
||||
self.enable_mcp = enable_mcp
|
||||
|
||||
# Create FastAPI app
|
||||
self.app = FastAPI(
|
||||
title="AI.Card - Card Game System",
|
||||
description="MCP server for ai.card system",
|
||||
version=settings.app_version
|
||||
)
|
||||
|
||||
# Create MCP server with FastAPI app
|
||||
self.server = None
|
||||
if enable_mcp:
|
||||
self.server = FastMCP("aicard")
|
||||
self._register_mcp_tools()
|
||||
|
||||
def _register_mcp_tools(self):
|
||||
"""Register all MCP tools"""
|
||||
|
||||
@self.app.get("/get_user_cards", operation_id="get_user_cards")
|
||||
async def get_user_cards(
|
||||
did: str,
|
||||
limit: int = 10,
|
||||
session: AsyncSession = Depends(get_session)
|
||||
) -> List[Dict[str, Any]]:
|
||||
"""Get all cards owned by a user"""
|
||||
try:
|
||||
user_repo = UserRepository(session)
|
||||
card_repo = CardRepository(session)
|
||||
|
||||
# Get user
|
||||
user = await user_repo.get_by_did(did)
|
||||
if not user:
|
||||
return []
|
||||
|
||||
# Get user cards
|
||||
user_cards = await card_repo.get_user_cards(user.id, limit=limit)
|
||||
|
||||
return [
|
||||
{
|
||||
"id": card.card_id,
|
||||
"cp": card.cp,
|
||||
"status": card.status,
|
||||
"skill": card.skill,
|
||||
"owner_did": did,
|
||||
"obtained_at": card.obtained_at.isoformat(),
|
||||
"is_unique": card.is_unique,
|
||||
"unique_id": str(card.unique_id) if card.unique_id else None
|
||||
}
|
||||
for card in user_cards
|
||||
]
|
||||
except Exception as e:
|
||||
logger.error(f"Error getting user cards: {e}")
|
||||
return []
|
||||
|
||||
@self.app.post("/draw_card", operation_id="draw_card")
|
||||
async def draw_card(
|
||||
did: str,
|
||||
is_paid: bool = False,
|
||||
session: AsyncSession = Depends(get_session)
|
||||
) -> Dict[str, Any]:
|
||||
"""Draw a new card (gacha) for user"""
|
||||
try:
|
||||
gacha_service = GachaService(session)
|
||||
|
||||
# Draw card
|
||||
card, is_unique = await gacha_service.draw_card(did, is_paid)
|
||||
await session.commit()
|
||||
|
||||
return {
|
||||
"success": True,
|
||||
"card": {
|
||||
"id": card.id,
|
||||
"cp": card.cp,
|
||||
"status": card.status,
|
||||
"skill": card.skill,
|
||||
"owner_did": card.owner_did,
|
||||
"obtained_at": card.obtained_at.isoformat(),
|
||||
"is_unique": card.is_unique,
|
||||
"unique_id": card.unique_id
|
||||
},
|
||||
"is_unique": is_unique,
|
||||
"animation_type": "kira" if card.status in [CardRarity.KIRA, CardRarity.UNIQUE] else "normal"
|
||||
}
|
||||
except Exception as e:
|
||||
logger.error(f"Error drawing card: {e}")
|
||||
await session.rollback()
|
||||
return {
|
||||
"success": False,
|
||||
"error": str(e)
|
||||
}
|
||||
|
||||
@self.app.get("/get_card_details", operation_id="get_card_details")
|
||||
async def get_card_details(
|
||||
card_id: int,
|
||||
session: AsyncSession = Depends(get_session)
|
||||
) -> Dict[str, Any]:
|
||||
"""Get detailed information about a card type"""
|
||||
try:
|
||||
# Get card info from gacha service
|
||||
gacha_service = GachaService(session)
|
||||
|
||||
if card_id not in gacha_service.CARD_INFO:
|
||||
return {"error": f"Card ID {card_id} not found"}
|
||||
|
||||
card_info = gacha_service.CARD_INFO[card_id]
|
||||
|
||||
# Get unique card availability
|
||||
unique_repo = UniqueCardRepository(session)
|
||||
is_unique_available = await unique_repo.is_card_available(card_id)
|
||||
|
||||
return {
|
||||
"id": card_id,
|
||||
"name": card_info["name"],
|
||||
"base_cp_range": card_info["base_cp_range"],
|
||||
"is_unique_available": is_unique_available,
|
||||
"description": f"Card {card_id}: {card_info['name']}"
|
||||
}
|
||||
except Exception as e:
|
||||
logger.error(f"Error getting card details: {e}")
|
||||
return {"error": str(e)}
|
||||
|
||||
@self.app.post("/sync_cards_atproto", operation_id="sync_cards_atproto")
|
||||
async def sync_cards_atproto(
|
||||
did: str,
|
||||
session: AsyncSession = Depends(get_session)
|
||||
) -> Dict[str, str]:
|
||||
"""Sync user's cards with atproto (temporarily disabled)"""
|
||||
return {"status": "atproto sync temporarily disabled due to dependency issues"}
|
||||
|
||||
@self.app.get("/analyze_card_collection", operation_id="analyze_card_collection")
|
||||
async def analyze_card_collection(
|
||||
did: str,
|
||||
session: AsyncSession = Depends(get_session)
|
||||
) -> Dict[str, Any]:
|
||||
"""Analyze user's card collection"""
|
||||
try:
|
||||
user_repo = UserRepository(session)
|
||||
card_repo = CardRepository(session)
|
||||
|
||||
# Get user
|
||||
user = await user_repo.get_by_did(did)
|
||||
if not user:
|
||||
return {
|
||||
"total_cards": 0,
|
||||
"rarity_distribution": {},
|
||||
"message": "User not found"
|
||||
}
|
||||
|
||||
# Get all user cards
|
||||
user_cards = await card_repo.get_user_cards(user.id, limit=1000)
|
||||
|
||||
if not user_cards:
|
||||
return {
|
||||
"total_cards": 0,
|
||||
"rarity_distribution": {},
|
||||
"message": "No cards found"
|
||||
}
|
||||
|
||||
# Analyze collection
|
||||
rarity_count = {}
|
||||
total_cp = 0
|
||||
card_type_count = {}
|
||||
|
||||
for card in user_cards:
|
||||
# Rarity distribution
|
||||
rarity = card.status
|
||||
rarity_count[rarity] = rarity_count.get(rarity, 0) + 1
|
||||
|
||||
# Total CP
|
||||
total_cp += card.cp
|
||||
|
||||
# Card type distribution
|
||||
card_type_count[card.card_id] = card_type_count.get(card.card_id, 0) + 1
|
||||
|
||||
# Find strongest card
|
||||
strongest_card = max(user_cards, key=lambda x: x.cp)
|
||||
|
||||
return {
|
||||
"total_cards": len(user_cards),
|
||||
"rarity_distribution": rarity_count,
|
||||
"card_type_distribution": card_type_count,
|
||||
"average_cp": total_cp / len(user_cards) if user_cards else 0,
|
||||
"total_cp": total_cp,
|
||||
"strongest_card": {
|
||||
"id": strongest_card.card_id,
|
||||
"cp": strongest_card.cp,
|
||||
"status": strongest_card.status,
|
||||
"is_unique": strongest_card.is_unique
|
||||
},
|
||||
"unique_count": len([c for c in user_cards if c.is_unique])
|
||||
}
|
||||
except Exception as e:
|
||||
logger.error(f"Error analyzing collection: {e}")
|
||||
return {"error": str(e)}
|
||||
|
||||
@self.app.get("/get_unique_registry", operation_id="get_unique_registry")
|
||||
async def get_unique_registry(
|
||||
session: AsyncSession = Depends(get_session)
|
||||
) -> Dict[str, Any]:
|
||||
"""Get all registered unique cards"""
|
||||
try:
|
||||
unique_repo = UniqueCardRepository(session)
|
||||
|
||||
# Get all unique cards
|
||||
unique_cards = await unique_repo.get_all_unique_cards()
|
||||
|
||||
# Get available unique card IDs
|
||||
available_ids = await unique_repo.get_available_unique_cards()
|
||||
|
||||
return {
|
||||
"registered_unique_cards": [
|
||||
{
|
||||
"card_id": card.card_id,
|
||||
"unique_id": card.unique_id,
|
||||
"owner_did": card.owner_did,
|
||||
"obtained_at": card.obtained_at.isoformat()
|
||||
}
|
||||
for card in unique_cards
|
||||
],
|
||||
"available_unique_card_ids": available_ids,
|
||||
"total_registered": len(unique_cards),
|
||||
"total_available": len(available_ids)
|
||||
}
|
||||
except Exception as e:
|
||||
logger.error(f"Error getting unique registry: {e}")
|
||||
return {"error": str(e)}
|
||||
|
||||
@self.app.get("/get_gacha_stats", operation_id="get_gacha_stats")
|
||||
async def get_gacha_stats(
|
||||
session: AsyncSession = Depends(get_session)
|
||||
) -> Dict[str, Any]:
|
||||
"""Get gacha system statistics"""
|
||||
try:
|
||||
return {
|
||||
"rarity_probabilities": {
|
||||
"normal": f"{100 - settings.prob_rare}%",
|
||||
"rare": f"{settings.prob_rare - settings.prob_super_rare}%",
|
||||
"super_rare": f"{settings.prob_super_rare - settings.prob_kira}%",
|
||||
"kira": f"{settings.prob_kira - settings.prob_unique}%",
|
||||
"unique": f"{settings.prob_unique}%"
|
||||
},
|
||||
"total_card_types": 16,
|
||||
"card_names": [info["name"] for info in GachaService.CARD_INFO.values()],
|
||||
"system_info": {
|
||||
"daily_limit": "1 free draw per day",
|
||||
"paid_gacha": "Enhanced probabilities",
|
||||
"unique_system": "First-come-first-served globally unique cards"
|
||||
}
|
||||
}
|
||||
except Exception as e:
|
||||
logger.error(f"Error getting gacha stats: {e}")
|
||||
return {"error": str(e)}
|
||||
|
||||
# MCP server will be run separately, not here
|
||||
|
||||
def get_server(self) -> Optional[FastMCP]:
|
||||
"""Get the FastAPI MCP server instance"""
|
||||
return self.server
|
||||
|
||||
def get_app(self) -> FastAPI:
|
||||
"""Get the FastAPI app instance"""
|
||||
return self.app
|
||||
@ -1,5 +1,6 @@
|
||||
"""Authentication routes"""
|
||||
from datetime import timedelta
|
||||
from typing import Optional
|
||||
from fastapi import APIRouter, HTTPException, Depends, Response
|
||||
from fastapi.responses import JSONResponse
|
||||
from pydantic import BaseModel
|
||||
@ -12,9 +13,9 @@ from app.auth.dependencies import (
|
||||
AuthUser,
|
||||
ACCESS_TOKEN_EXPIRE_MINUTES
|
||||
)
|
||||
from app.db.base import get_db
|
||||
from app.db.base import get_session
|
||||
from app.repositories.user import UserRepository
|
||||
from app.services.atproto import AtprotoService
|
||||
# from app.services.atproto import AtprotoService
|
||||
|
||||
|
||||
router = APIRouter(prefix="/auth", tags=["auth"])
|
||||
@ -45,7 +46,7 @@ class VerifyResponse(BaseModel):
|
||||
async def login(
|
||||
request: LoginRequest,
|
||||
response: Response,
|
||||
db: AsyncSession = Depends(get_db)
|
||||
db: AsyncSession = Depends(get_session)
|
||||
):
|
||||
"""
|
||||
Login with atproto credentials
|
||||
|
||||
@ -7,7 +7,7 @@ from app.models.card import Card, CardDraw, CardDrawResult
|
||||
from app.services.gacha import GachaService
|
||||
from app.repositories.user import UserRepository
|
||||
from app.repositories.card import CardRepository, UniqueCardRepository
|
||||
from app.db.base import get_db
|
||||
from app.db.base import get_session
|
||||
|
||||
router = APIRouter(prefix="/cards", tags=["cards"])
|
||||
|
||||
@ -15,7 +15,7 @@ router = APIRouter(prefix="/cards", tags=["cards"])
|
||||
@router.post("/draw", response_model=CardDrawResult)
|
||||
async def draw_card(
|
||||
draw_request: CardDraw,
|
||||
db: AsyncSession = Depends(get_db)
|
||||
db: AsyncSession = Depends(get_session)
|
||||
):
|
||||
"""
|
||||
カードを抽選する
|
||||
@ -65,7 +65,7 @@ async def get_user_cards(
|
||||
user_did: str,
|
||||
skip: int = 0,
|
||||
limit: int = 100,
|
||||
db: AsyncSession = Depends(get_db)
|
||||
db: AsyncSession = Depends(get_session)
|
||||
):
|
||||
"""
|
||||
ユーザーの所有カード一覧を取得
|
||||
@ -100,7 +100,7 @@ async def get_user_cards(
|
||||
|
||||
|
||||
@router.get("/unique")
|
||||
async def get_unique_cards(db: AsyncSession = Depends(get_db)):
|
||||
async def get_unique_cards(db: AsyncSession = Depends(get_session)):
|
||||
"""
|
||||
全てのuniqueカード一覧を取得（所有者情報付き）
|
||||
"""
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
"""Synchronization routes for atproto"""
|
||||
from typing import Optional
|
||||
from fastapi import APIRouter, HTTPException, Depends
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from pydantic import BaseModel
|
||||
|
||||
from app.auth.dependencies import require_user, AuthUser
|
||||
from app.db.base import get_db
|
||||
from app.db.base import get_session
|
||||
from app.services.card_sync import CardSyncService
|
||||
from app.repositories.user import UserRepository
|
||||
|
||||
@ -28,7 +29,7 @@ class SyncResponse(BaseModel):
|
||||
async def sync_cards(
|
||||
request: SyncRequest,
|
||||
current_user: AuthUser = Depends(require_user),
|
||||
db: AsyncSession = Depends(get_db)
|
||||
db: AsyncSession = Depends(get_session)
|
||||
):
|
||||
"""
|
||||
Sync cards between database and atproto PDS
|
||||
@ -68,7 +69,7 @@ async def sync_cards(
|
||||
async def export_to_pds(
|
||||
request: SyncRequest,
|
||||
current_user: AuthUser = Depends(require_user),
|
||||
db: AsyncSession = Depends(get_db)
|
||||
db: AsyncSession = Depends(get_session)
|
||||
):
|
||||
"""
|
||||
Export all cards to atproto PDS
|
||||
@ -97,7 +98,7 @@ async def export_to_pds(
|
||||
async def import_from_pds(
|
||||
request: SyncRequest,
|
||||
current_user: AuthUser = Depends(require_user),
|
||||
db: AsyncSession = Depends(get_db)
|
||||
db: AsyncSession = Depends(get_session)
|
||||
):
|
||||
"""
|
||||
Import cards from atproto PDS
|
||||
@ -125,7 +126,7 @@ async def verify_card_ownership(
|
||||
card_id: int,
|
||||
unique_id: Optional[str] = None,
|
||||
current_user: AuthUser = Depends(require_user),
|
||||
db: AsyncSession = Depends(get_db)
|
||||
db: AsyncSession = Depends(get_session)
|
||||
):
|
||||
"""
|
||||
Verify user owns a specific card
|
||||
|
||||
@ -3,7 +3,7 @@ from typing import List, Dict, Any, Optional
|
||||
from datetime import datetime
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.services.atproto import AtprotoService, CardLexicon
|
||||
# from app.services.atproto import AtprotoService, CardLexicon
|
||||
from app.repositories.card import CardRepository
|
||||
from app.repositories.user import UserRepository
|
||||
from app.models.card import Card as CardModel
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
"""Initialize database with master data"""
|
||||
import asyncio
|
||||
from sqlalchemy import text, select, func
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from app.db.base import engine, Base, async_session
|
||||
from app.db.models import CardMaster
|
||||
@ -35,10 +36,14 @@ async def init_db():
|
||||
print("Inserting master data...")
|
||||
async with async_session() as session:
|
||||
# Check if master data already exists
|
||||
existing = await session.execute(
|
||||
"SELECT COUNT(*) FROM card_master"
|
||||
)
|
||||
count = existing.scalar()
|
||||
try:
|
||||
result = await session.execute(
|
||||
select(func.count()).select_from(CardMaster)
|
||||
)
|
||||
count = result.scalar()
|
||||
except Exception:
|
||||
# Table might not exist yet
|
||||
count = 0
|
||||
|
||||
if count == 0:
|
||||
# Insert card master data
|
||||
|
||||
@ -1,18 +1,20 @@
|
||||
fastapi==0.104.1
|
||||
uvicorn[standard]==0.24.0
|
||||
pydantic==2.5.0
|
||||
pydantic-settings==2.1.0
|
||||
fastapi>=0.104.1
|
||||
uvicorn[standard]>=0.24.0
|
||||
pydantic>=2.7.0,<3.0.0
|
||||
pydantic-settings>=2.1.0
|
||||
python-multipart==0.0.6
|
||||
httpx==0.25.2
|
||||
httpx>=0.25.0,<0.29.0
|
||||
python-jose[cryptography]==3.3.0
|
||||
passlib[bcrypt]==1.7.4
|
||||
sqlalchemy==2.0.23
|
||||
alembic==1.12.1
|
||||
asyncpg==0.29.0
|
||||
psycopg2-binary==2.9.9
|
||||
aiosqlite==0.19.0
|
||||
sqlalchemy>=2.0.23
|
||||
greenlet>=3.0.0
|
||||
alembic>=1.12.1
|
||||
# asyncpg==0.29.0 # Disabled: requires compilation
|
||||
# psycopg2-binary==2.9.9 # Disabled: requires compilation
|
||||
aiosqlite>=0.19.0
|
||||
python-dotenv==1.0.0
|
||||
pytest==7.4.3
|
||||
pytest-asyncio==0.21.1
|
||||
atproto==0.0.46
|
||||
supabase==2.3.0
|
||||
atproto>=0.0.55
|
||||
# supabase>=2.3.0 # Temporarily disabled due to httpx version conflict
|
||||
fastapi-mcp==0.1.0
|
||||
416
claude.md
416
claude.md
@ -1,278 +1,168 @@
|
||||
# エコシステム統合設計書
|
||||
# ai.card 開発ガイド (Claude Code用)
|
||||
|
||||
## 中核思想
|
||||
- **存在子理論**: この世界で最も小さいもの（存在子/ai）の探求
|
||||
- **唯一性原則**: 現実の個人の唯一性をすべてのシステムで担保
|
||||
- **現実の反映**: 現実→ゲーム→現実の循環的影響
|
||||
## プロジェクト概要
|
||||
**ai.card** - atproto基盤のカードゲームシステム。iOS/Web/APIで構成され、ユーザーデータ主権を実現。
|
||||
|
||||
## システム構成図
|
||||
## 現在の状態 (2025/01/06)
|
||||
- ✅ MCP Server実装完了
|
||||
- ✅ SQLiteデータベース稼働中
|
||||
- ✅ 基本的なガチャ・カード管理機能
|
||||
- 🔧 atproto連携は一時無効化
|
||||
- 📱 iOS/Web実装待ち
|
||||
|
||||
```
|
||||
存在子(ai) - 最小単位の意識
|
||||
↓
|
||||
[ai.moji] 文字システム
|
||||
↓
|
||||
[ai.os] + [ai.game device] ← 統合ハードウェア
|
||||
├── ai.shell (Claude Code的機能)
|
||||
├── ai.gpt (自律人格・記憶システム)
|
||||
├── ai.ai (個人特化AI・心を読み取るAI)
|
||||
├── ai.card (カードゲーム・iOS/Web/API)
|
||||
└── ai.bot (分散SNS連携・カード配布)
|
||||
↓
|
||||
[ai.verse] メタバース
|
||||
├── world system (惑星型3D世界)
|
||||
├── at system (atproto/分散SNS)
|
||||
├── yui system (唯一性担保)
|
||||
└── ai system (存在属性)
|
||||
## 開発環境セットアップ
|
||||
|
||||
### 必要なもの
|
||||
- Python 3.13
|
||||
- Node.js (Web開発用)
|
||||
- Docker (PostgreSQL用、オプション)
|
||||
- Xcode (iOS開発用)
|
||||
|
||||
### 初回セットアップ
|
||||
```bash
|
||||
# 1. プロジェクトディレクトリ
|
||||
cd /Users/syui/ai/gpt/card
|
||||
|
||||
# 2. 仮想環境構築
|
||||
./setup_venv.sh
|
||||
|
||||
# 3. データベース初期化
|
||||
cd api
|
||||
~/.config/syui/ai/card/venv/bin/python init_db.py
|
||||
|
||||
# 4. サーバー起動
|
||||
cd ..
|
||||
./start_server.sh
|
||||
```
|
||||
|
||||
## 名前規則
|
||||
## 開発時の作業分担提案
|
||||
|
||||
名前規則は他のprojectと全て共通しています。exampleを示しますので、このルールに従ってください。
|
||||
### ai.gptプロジェクトで起動 (MCP/バックエンド作業)
|
||||
**適している作業:**
|
||||
- MCPサーバー機能の追加・修正
|
||||
- データベーススキーマ変更
|
||||
- API エンドポイント追加
|
||||
- バックエンドロジック実装
|
||||
|
||||
ここでは`ai.os`の場合の名前規則の例を記述します。
|
||||
|
||||
name: ai.os
|
||||
|
||||
**[ "package", "code", "command" ]**: aios
|
||||
**[ "dir", "url" ]**: ai/os
|
||||
**[ "domain", "json" ]**: ai.os
|
||||
|
||||
```sh
|
||||
$ curl -sL https://git.syui.ai/ai/ai/raw/branch/main/ai.json|jq .ai.os
|
||||
{ "type": "os" }
|
||||
**起動方法:**
|
||||
```bash
|
||||
cd /Users/syui/ai/gpt
|
||||
# Claude Codeをここで起動
|
||||
# ai.card/api/ を編集対象にする
|
||||
```
|
||||
|
||||
```json
|
||||
{
|
||||
"ai": {
|
||||
"os":{}
|
||||
}
|
||||
}
|
||||
### ai.cardプロジェクトで起動 (フロントエンド作業)
|
||||
**適している作業:**
|
||||
- iOS アプリ開発 (Swift/SwiftUI)
|
||||
- Web フロントエンド開発 (React/TypeScript)
|
||||
- UI/UX デザイン実装
|
||||
- クライアント側ロジック
|
||||
|
||||
**起動方法:**
|
||||
```bash
|
||||
cd /Users/syui/ai/gpt/card
|
||||
# Claude Codeをここで起動
|
||||
# ios/ または web/ を編集対象にする
|
||||
```
|
||||
|
||||
他のprojectも同じ名前規則を採用します。`ai.gpt`ならpackageは`aigpt`です。
|
||||
|
||||
## config(設定ファイル, env, 環境依存)
|
||||
|
||||
`config`を置く場所は統一されており、各projectの名前規則の`dir`項目を使用します。例えば、aiosの場合は`~/.config/syui/ai/os/`以下となります。pythonなどを使用する場合、`python -m venv`などでこのpackage config dir配下に仮想環境を構築して実行するようにしてください。
|
||||
|
||||
domain形式を採用して、私は各projectを`git.syui.ai/ai`にhostしていますから、`~/.config/syui/ai`とします。
|
||||
|
||||
```sh
|
||||
[syui.ai]
|
||||
syui/ai
|
||||
## ディレクトリ構造
|
||||
```
|
||||
ai.card/
|
||||
├── api/ # バックエンド (Python/FastAPI)
|
||||
│ ├── app/
|
||||
│ │ ├── main.py # エントリポイント
|
||||
│ │ ├── mcp_server.py # MCPサーバー実装
|
||||
│ │ ├── models/ # データモデル
|
||||
│ │ ├── routes/ # APIルート
|
||||
│ │ └── services/ # ビジネスロジック
|
||||
│ └── requirements.txt
|
||||
├── ios/ # iOSアプリ (Swift)
|
||||
│ └── AiCard/
|
||||
├── web/ # Webフロントエンド (React)
|
||||
│ └── src/
|
||||
├── docs/ # ドキュメント
|
||||
├── setup_venv.sh # 環境構築スクリプト
|
||||
└── start_server.sh # サーバー起動スクリプト
|
||||
```
|
||||
|
||||
```sh
|
||||
# example
|
||||
~/.config/syui/ai
|
||||
├── card
|
||||
├── gpt
|
||||
├── os
|
||||
└── shell
|
||||
## 主要な技術スタック
|
||||
|
||||
### バックエンド
|
||||
- **言語**: Python 3.13
|
||||
- **フレームワーク**: FastAPI + fastapi-mcp
|
||||
- **データベース**: SQLite (開発) / PostgreSQL (本番予定)
|
||||
- **ORM**: SQLAlchemy 2.0
|
||||
|
||||
### フロントエンド
|
||||
- **iOS**: Swift 5.9 + SwiftUI
|
||||
- **Web**: React + TypeScript + Vite
|
||||
- **スタイリング**: CSS Modules
|
||||
|
||||
## 現在の課題と制約
|
||||
|
||||
### 依存関係の問題
|
||||
1. **atproto**: `SessionString` APIが変更されたため一部機能無効化
|
||||
2. **supabase**: httpxバージョン競合で無効化
|
||||
3. **PostgreSQL**: ネイティブ拡張のコンパイル問題でSQLite使用中
|
||||
|
||||
### 回避策
|
||||
- atproto機能はモック実装で代替
|
||||
- データベースはSQLiteで開発継続
|
||||
- 本番環境ではDockerでPostgreSQL使用予定
|
||||
|
||||
## API仕様
|
||||
|
||||
### MCP Tools (9個)
|
||||
1. **get_user_cards(did: str)** - ユーザーのカード一覧取得
|
||||
2. **draw_card(did: str, is_paid: bool)** - ガチャでカード取得
|
||||
3. **get_card_details(card_id: int)** - カード詳細情報
|
||||
4. **analyze_card_collection(did: str)** - コレクション分析
|
||||
5. **get_unique_registry()** - ユニークカード登録状況
|
||||
6. **sync_cards_atproto(did: str)** - atproto同期（無効化中）
|
||||
7. **get_gacha_stats()** - ガチャ統計情報
|
||||
|
||||
### REST API
|
||||
- `/api/v1/cards/*` - カード管理
|
||||
- `/api/v1/auth/*` - 認証（モック実装）
|
||||
- `/api/v1/sync/*` - 同期機能
|
||||
|
||||
## 今後の開発予定
|
||||
|
||||
### Phase 1: 基盤強化
|
||||
- [ ] PostgreSQL移行（Docker利用）
|
||||
- [ ] atproto最新版対応
|
||||
- [ ] テストコード追加
|
||||
|
||||
### Phase 2: クライアント実装
|
||||
- [ ] iOS アプリ基本機能
|
||||
- [ ] Web フロントエンド
|
||||
- [ ] リアルタイムガチャ演出
|
||||
|
||||
### Phase 3: 本格運用
|
||||
- [ ] Cloudflare デプロイ
|
||||
- [ ] ユーザーデータ主権実装
|
||||
- [ ] ai.verse連携
|
||||
|
||||
## 注意事項
|
||||
- サーバーは`--reload`モードで起動中（ファイル変更で自動再起動）
|
||||
- データベースは `~/.config/syui/ai/card/aicard.db`
|
||||
- 仮想環境は `~/.config/syui/ai/card/venv/`
|
||||
- エラーログはターミナルに出力される
|
||||
|
||||
## デバッグ用コマンド
|
||||
```bash
|
||||
# データベース確認
|
||||
sqlite3 ~/.config/syui/ai/card/aicard.db ".tables"
|
||||
|
||||
# API動作確認
|
||||
curl http://localhost:8000/health
|
||||
curl "http://localhost:8000/get_gacha_stats"
|
||||
|
||||
# ログ確認
|
||||
tail -f /var/log/aicard.log # 未実装
|
||||
```
|
||||
|
||||
## 各システム詳細
|
||||
|
||||
### ai.gpt - 自律的送信AI
|
||||
**目的**: 関係性に基づく自発的コミュニケーション
|
||||
|
||||
**中核概念**:
|
||||
- **人格**: 記憶（過去の発話）と関係性パラメータで構成
|
||||
- **唯一性**: atproto accountとの1:1紐付け、改変不可能
|
||||
- **自律送信**: 関係性が閾値を超えると送信機能が解禁
|
||||
|
||||
**技術構成**:
|
||||
- `MemoryManager`: 完全ログ→AI要約→コア判定→選択的忘却
|
||||
- `RelationshipTracker`: 時間減衰・日次制限付き関係性スコア
|
||||
- `TransmissionController`: 閾値判定・送信トリガー
|
||||
- `Persona`: AI運勢（1-10ランダム）による人格変動
|
||||
|
||||
**実装仕様**:
|
||||
```
|
||||
- 言語: Python (fastapi_mcp)
|
||||
- ストレージ: JSON/SQLite選択式
|
||||
- インターフェース: Python CLI (click/typer)
|
||||
- スケジューリング: cron-like自律処理
|
||||
```
|
||||
|
||||
### ai.card - カードゲームシステム
|
||||
**目的**: atproto基盤でのユーザーデータ主権カードゲーム
|
||||
|
||||
**現在の状況**:
|
||||
- ai.botの機能として実装済み
|
||||
- atproto accountでmentionすると1日1回カードを取得
|
||||
- ai.api (MCP server予定) でユーザー管理
|
||||
|
||||
**移行計画**:
|
||||
- **iOS移植**: Claudeが担当予定
|
||||
- **データ保存**: atproto collection recordに保存（ユーザーがデータを所有）
|
||||
- **不正防止**: OAuth 2.1 scope (実装待ち) + MCP serverで対応
|
||||
- **画像ファイル**: Cloudflare Pagesが最適
|
||||
|
||||
**yui system適用**:
|
||||
- カードの効果がアカウント固有
|
||||
- 改ざん防止によるゲームバランス維持
|
||||
- 将来的にai.verseとの統合で固有スキルと連動
|
||||
|
||||
### ai.ai - 心を読み取るAI
|
||||
**目的**: 個人特化型AI・深層理解システム
|
||||
|
||||
**ai.gptとの関係**:
|
||||
- ai.gpt → ai.ai: 自律送信AIから心理分析AIへの連携
|
||||
- 関係性パラメータの深層分析
|
||||
- ユーザーの思想コア部分の特定支援
|
||||
|
||||
### ai.verse - UEメタバース
|
||||
**目的**: 現実反映型3D世界
|
||||
|
||||
**yui system実装**:
|
||||
- キャラクター ↔ プレイヤー 1:1紐付け
|
||||
- unique skill: そのプレイヤーのみ使用可能
|
||||
- 他プレイヤーは同キャラでも同スキル使用不可
|
||||
|
||||
**統合要素**:
|
||||
- ai.card: ゲーム内アイテムとしてのカード
|
||||
- ai.gpt: NPCとしての自律AI人格
|
||||
- atproto: ゲーム内プロフィール連携
|
||||
|
||||
## データフロー設計
|
||||
|
||||
### 唯一性担保の実装
|
||||
```
|
||||
現実の個人 → atproto account (DID) → ゲーム内avatar → 固有スキル
|
||||
↑_______________________________| (現実の反映)
|
||||
```
|
||||
|
||||
### AI駆動変換システム
|
||||
```
|
||||
遊び・創作活動 → ai.gpt分析 → 業務成果変換 → 企業価値創出
|
||||
↑________________________| (Play-to-Work)
|
||||
```
|
||||
|
||||
### カードゲーム・データ主権フロー
|
||||
```
|
||||
ユーザー → ai.bot mention → カード生成 → atproto collection → ユーザー所有
|
||||
↑ ↓
|
||||
← iOS app表示 ← ai.card API ←
|
||||
```
|
||||
|
||||
## 技術スタック統合
|
||||
|
||||
### Core Infrastructure
|
||||
- **OS**: Rust-based ai.os (Arch Linux base)
|
||||
- **Container**: Docker image distribution
|
||||
- **Identity**: atproto selfhost server + DID管理
|
||||
- **AI**: fastapi_mcp server architecture
|
||||
- **CLI**: Python unified (click/typer) - Rustから移行
|
||||
|
||||
### Game Engine Integration
|
||||
- **Engine**: Unreal Engine (Blueprint)
|
||||
- **Data**: atproto → UE → atproto sync
|
||||
- **Avatar**: 分散SNS profile → 3D character
|
||||
- **Streaming**: game screen = broadcast screen
|
||||
|
||||
### Mobile/Device
|
||||
- **iOS**: ai.card移植 (Claude担当)
|
||||
- **Hardware**: ai.game device (future)
|
||||
- **Interface**: controller-first design
|
||||
|
||||
## 実装優先順位
|
||||
|
||||
### Phase 1: AI基盤強化 (現在進行)
|
||||
- [ ] ai.gpt memory system完全実装
|
||||
- 記憶の階層化（完全ログ→要約→コア→忘却）
|
||||
- 関係性パラメータの時間減衰システム
|
||||
- AI運勢による人格変動機能
|
||||
- [ ] ai.card iOS移植
|
||||
- atproto collection record連携
|
||||
- MCP server化（ai.api刷新）
|
||||
- [ ] fastapi_mcp統一基盤構築
|
||||
|
||||
### Phase 2: ゲーム統合
|
||||
- [ ] ai.verse yui system実装
|
||||
- unique skill機能
|
||||
- atproto連携強化
|
||||
- [ ] ai.gpt ↔ ai.ai連携機能
|
||||
- [ ] 分散SNS ↔ ゲーム同期
|
||||
|
||||
### Phase 3: メタバース浸透
|
||||
- [ ] VTuber配信機能統合
|
||||
- [ ] Play-to-Work変換システム
|
||||
- [ ] ai.game device prototype
|
||||
|
||||
## 将来的な連携構想
|
||||
|
||||
### システム間連携（現在は独立実装）
|
||||
```
|
||||
ai.gpt (自律送信) ←→ ai.ai (心理分析)
|
||||
ai.card (iOS,Web,API) ←→ ai.verse (UEゲーム世界)
|
||||
```
|
||||
|
||||
**共通基盤**: fastapi_mcp
|
||||
**共通思想**: yui system（現実の反映・唯一性担保）
|
||||
|
||||
### データ改ざん防止戦略
|
||||
- **短期**: MCP serverによる検証
|
||||
- **中期**: OAuth 2.1 scope実装待ち
|
||||
- **長期**: ブロックチェーン的整合性チェック
|
||||
|
||||
## AIコミュニケーション最適化
|
||||
|
||||
### プロジェクト要件定義テンプレート
|
||||
```markdown
|
||||
# [プロジェクト名] 要件定義
|
||||
|
||||
## 哲学的背景
|
||||
- 存在子理論との関連：
|
||||
- yui system適用範囲：
|
||||
- 現実反映の仕組み：
|
||||
|
||||
## 技術要件
|
||||
- 使用技術（fastapi_mcp統一）：
|
||||
- atproto連携方法：
|
||||
- データ永続化方法：
|
||||
|
||||
## ユーザーストーリー
|
||||
1. ユーザーが...すると
|
||||
2. システムが...を実行し
|
||||
3. 結果として...が実現される
|
||||
|
||||
## 成功指標
|
||||
- 技術的：
|
||||
- 哲学的（唯一性担保）：
|
||||
```
|
||||
|
||||
### Claude Code活用戦略
|
||||
1. **小さく始める**: ai.gptのMCP機能拡張から
|
||||
2. **段階的統合**: 各システムを個別に完成させてから統合
|
||||
3. **哲学的一貫性**: 各実装でyui systemとの整合性を確認
|
||||
4. **現実反映**: 実装がどう現実とゲームを繋ぐかを常に明記
|
||||
|
||||
## 開発上の留意点
|
||||
|
||||
### MCP Server設計指針
|
||||
- 各AI（gpt, card, ai, bot）は独立したMCPサーバー
|
||||
- fastapi_mcp基盤で統一
|
||||
- atproto DIDによる認証・認可
|
||||
|
||||
### 記憶・データ管理
|
||||
- **ai.gpt**: 関係性の不可逆性重視
|
||||
- **ai.card**: ユーザーデータ主権重視
|
||||
- **ai.verse**: ゲーム世界の整合性重視
|
||||
|
||||
### 唯一性担保実装
|
||||
- atproto accountとの1:1紐付け必須
|
||||
- 改変不可能性をハッシュ・署名で保証
|
||||
- 他システムでの再現不可能性を技術的に実現
|
||||
|
||||
## 継続的改善
|
||||
- 各プロジェクトでこの設計書を参照
|
||||
- 新機能追加時はyui systemとの整合性をチェック
|
||||
- 他システムへの影響を事前評価
|
||||
- Claude Code導入時の段階的移行計画
|
||||
|
||||
# footer
|
||||
|
||||
© syui
|
||||
## 参考リンク
|
||||
- [AI エコシステム統合設計書](/Users/syui/ai/gpt/CLAUDE.md)
|
||||
- [MCP統合作業報告](./docs/MCP_INTEGRATION_SUMMARY.md)
|
||||
- [API仕様書](http://localhost:8000/docs) ※サーバー起動時のみ
|
||||
23
docker-compose.dev.yml
Normal file
23
docker-compose.dev.yml
Normal file
@ -0,0 +1,23 @@
|
||||
# 開発用: PostgreSQLのみ起動
|
||||
version: '3.8'
|
||||
|
||||
services:
|
||||
postgres:
|
||||
image: postgres:16-alpine
|
||||
container_name: aicard_postgres_dev
|
||||
environment:
|
||||
POSTGRES_USER: postgres
|
||||
POSTGRES_PASSWORD: postgres
|
||||
POSTGRES_DB: aicard
|
||||
ports:
|
||||
- "5432:5432"
|
||||
volumes:
|
||||
- postgres_dev_data:/var/lib/postgresql/data
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U postgres"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
|
||||
volumes:
|
||||
postgres_dev_data:
|
||||
129
docs/MCP_INTEGRATION_SUMMARY.md
Normal file
129
docs/MCP_INTEGRATION_SUMMARY.md
Normal file
@ -0,0 +1,129 @@
|
||||
# ai.card MCP Server統合作業報告 (2025/01/06)
|
||||
|
||||
## 作業概要
|
||||
ai.cardプロジェクトに独立したMCPサーバーを実装し、FastAPIベースのカードゲームAPIをMCPツールとして公開。
|
||||
|
||||
## 実装内容
|
||||
|
||||
### 1. 依存関係の解決
|
||||
**課題と対応:**
|
||||
- `atproto==0.0.46` → `atproto>=0.0.55` (Python 3.13対応)
|
||||
- `httpx` バージョン競合 → supabase一時無効化
|
||||
- `pydantic==2.5.0` → `pydantic>=2.7.0` (atproto要件)
|
||||
- PostgreSQL依存 → SQLiteベースに変更
|
||||
- `greenlet` 追加 (SQLAlchemy非同期処理)
|
||||
|
||||
**最終的な依存関係:**
|
||||
```txt
|
||||
fastapi>=0.104.1
|
||||
uvicorn[standard]>=0.24.0
|
||||
pydantic>=2.7.0,<3.0.0
|
||||
sqlalchemy>=2.0.23
|
||||
greenlet>=3.0.0
|
||||
aiosqlite>=0.19.0
|
||||
fastapi-mcp==0.1.0
|
||||
atproto>=0.0.55
|
||||
# supabase>=2.3.0 # httpx競合のため無効化
|
||||
# asyncpg, psycopg2-binary # コンパイル回避のため無効化
|
||||
```
|
||||
|
||||
### 2. MCP Server実装
|
||||
**ファイル:** `api/app/mcp_server.py`
|
||||
|
||||
**主要変更:**
|
||||
- `from mcp.server.fastmcp import FastMCP` (正しいインポート)
|
||||
- `FastMCP("aicard")` で初期化
|
||||
- 9個のMCPツール実装
|
||||
|
||||
**公開ツール:**
|
||||
1. `get_user_cards` - ユーザーカード一覧
|
||||
2. `draw_card` - ガチャ実行
|
||||
3. `get_card_details` - カード詳細情報
|
||||
4. `analyze_card_collection` - コレクション分析
|
||||
5. `get_unique_registry` - ユニークカード登録状況
|
||||
6. `sync_cards_atproto` - atproto同期（無効化中）
|
||||
7. `get_gacha_stats` - ガチャ統計
|
||||
|
||||
### 3. データベース設定
|
||||
**SQLite使用:**
|
||||
- 場所: `~/.config/syui/ai/card/aicard.db`
|
||||
- 理由: 依存関係シンプル化、開発環境最適化
|
||||
- PostgreSQL移行: 将来的にDocker利用で対応
|
||||
|
||||
### 4. 補助スクリプト
|
||||
- `setup_venv.sh` - 仮想環境セットアップ
|
||||
- `start_server.sh` - サーバー起動スクリプト
|
||||
- `docker-compose.dev.yml` - PostgreSQL開発環境
|
||||
|
||||
## 既知の問題と対応
|
||||
|
||||
### 解決済み
|
||||
- ✅ fastapi-mcp インポートエラー → 正しいパッケージ名に修正
|
||||
- ✅ get_db → get_session 関数名不一致
|
||||
- ✅ Optional型インポート漏れ
|
||||
- ✅ SQLAlchemy greenlet依存
|
||||
- ✅ データベース初期化エラー
|
||||
|
||||
### 未解決（将来対応）
|
||||
- atproto SessionString APIの変更
|
||||
- supabase httpxバージョン競合
|
||||
- ガチャ確率計算の精度問題
|
||||
|
||||
## 環境セットアップ手順
|
||||
|
||||
### 1. 仮想環境構築
|
||||
```bash
|
||||
cd /Users/syui/ai/gpt/card
|
||||
./setup_venv.sh
|
||||
```
|
||||
|
||||
### 2. データベース初期化
|
||||
```bash
|
||||
cd api
|
||||
~/.config/syui/ai/card/venv/bin/python init_db.py
|
||||
```
|
||||
|
||||
### 3. サーバー起動
|
||||
```bash
|
||||
./start_server.sh
|
||||
# または
|
||||
cd api
|
||||
~/.config/syui/ai/card/venv/bin/python -m app.main
|
||||
```
|
||||
|
||||
### 4. 動作確認
|
||||
```bash
|
||||
# ヘルスチェック
|
||||
curl http://localhost:8000/health
|
||||
|
||||
# API仕様書
|
||||
open http://localhost:8000/docs
|
||||
|
||||
# カード取得テスト
|
||||
curl -X POST "http://localhost:8000/draw_card?did=did:plc:test123"
|
||||
```
|
||||
|
||||
## PostgreSQL移行（将来）
|
||||
|
||||
### Docker開発環境
|
||||
```bash
|
||||
# PostgreSQLのみ起動
|
||||
docker-compose -f docker-compose.dev.yml up -d
|
||||
|
||||
# 環境変数設定
|
||||
export DATABASE_URL="postgresql+asyncpg://postgres:postgres@localhost:5432/aicard"
|
||||
|
||||
# APIサーバー起動
|
||||
./start_server.sh
|
||||
```
|
||||
|
||||
### 本番環境
|
||||
- iOS/Webアプリ → PostgreSQL必須
|
||||
- Docker Composeで全サービス管理
|
||||
- Cloudflare Tunnel経由で公開
|
||||
|
||||
## 成果
|
||||
- ai.card独立MCPサーバー稼働
|
||||
- SQLiteベースで依存関係問題解決
|
||||
- 自動リロード対応の開発環境構築
|
||||
- iOS/Web連携準備完了
|
||||
116
setup_venv.sh
Executable file
116
setup_venv.sh
Executable file
@ -0,0 +1,116 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
# ai.card virtual environment setup script
|
||||
# This script sets up the Python virtual environment for ai.card MCP server
|
||||
|
||||
# Configuration
|
||||
CARD_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
API_DIR="$CARD_DIR/api"
|
||||
VENV_DIR="$HOME/.config/syui/ai/card/venv"
|
||||
REQUIREMENTS_FILE="$API_DIR/requirements.txt"
|
||||
|
||||
echo "🎴 ai.card Virtual Environment Setup"
|
||||
echo "======================================"
|
||||
echo "Card directory: $CARD_DIR"
|
||||
echo "API directory: $API_DIR"
|
||||
echo "Virtual environment: $VENV_DIR"
|
||||
echo
|
||||
|
||||
# Check if we're in the right directory
|
||||
if [ ! -f "$API_DIR/requirements.txt" ]; then
|
||||
echo "❌ Error: requirements.txt not found in $API_DIR"
|
||||
echo "Make sure you're running this script from the ai.card root directory"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Create config directory structure
|
||||
echo "📁 Creating config directory structure..."
|
||||
mkdir -p "$(dirname "$VENV_DIR")"
|
||||
|
||||
# Create virtual environment
|
||||
if [ -d "$VENV_DIR" ]; then
|
||||
echo "⚠️ Virtual environment already exists at $VENV_DIR"
|
||||
read -p "Do you want to recreate it? (y/N): " -n 1 -r
|
||||
echo
|
||||
if [[ $REPLY =~ ^[Yy]$ ]]; then
|
||||
echo "🗑️ Removing existing virtual environment..."
|
||||
rm -rf "$VENV_DIR"
|
||||
else
|
||||
echo "ℹ️ Using existing virtual environment"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ ! -d "$VENV_DIR" ]; then
|
||||
echo "🐍 Creating Python virtual environment..."
|
||||
python3 -m venv "$VENV_DIR"
|
||||
fi
|
||||
|
||||
# Activate virtual environment
|
||||
echo "🔌 Activating virtual environment..."
|
||||
source "$VENV_DIR/bin/activate"
|
||||
|
||||
# Upgrade pip
|
||||
echo "⬆️ Upgrading pip..."
|
||||
python -m pip install --upgrade pip
|
||||
|
||||
# Install dependencies
|
||||
echo "📦 Installing dependencies from requirements.txt..."
|
||||
pip install -r "$REQUIREMENTS_FILE"
|
||||
|
||||
# Verify installation
|
||||
echo "✅ Verifying installation..."
|
||||
cd "$API_DIR"
|
||||
|
||||
# Test basic imports
|
||||
echo " Testing FastAPI import..."
|
||||
python -c "import fastapi; print(f'✓ FastAPI {fastapi.__version__}')" || {
|
||||
echo "❌ FastAPI import failed"
|
||||
exit 1
|
||||
}
|
||||
|
||||
# Test fastapi-mcp import
|
||||
echo " Testing fastapi-mcp import..."
|
||||
python -c "from mcp.server.fastmcp import FastMCP; print('✓ FastMCP')" || {
|
||||
echo "❌ FastMCP import failed"
|
||||
exit 1
|
||||
}
|
||||
|
||||
# Test ai.card MCP server import
|
||||
echo " Testing ai.card MCP server import..."
|
||||
python -c "from app.mcp_server import AICardMcpServer; print('✓ AICardMcpServer')" || {
|
||||
echo "❌ AICardMcpServer import failed"
|
||||
exit 1
|
||||
}
|
||||
|
||||
echo
|
||||
echo "🎉 Setup completed successfully!"
|
||||
echo
|
||||
echo "Usage:"
|
||||
echo "------"
|
||||
echo "# Activate virtual environment:"
|
||||
echo "source $VENV_DIR/bin/activate"
|
||||
echo
|
||||
echo "# Start ai.card MCP server:"
|
||||
echo "cd $API_DIR"
|
||||
echo "uvicorn app.main:app --host localhost --port 8000 --reload"
|
||||
echo
|
||||
echo "# Test server:"
|
||||
echo "curl http://localhost:8000/health"
|
||||
echo
|
||||
echo "# Deactivate when done:"
|
||||
echo "deactivate"
|
||||
echo
|
||||
echo "MCP Server Features:"
|
||||
echo "-------------------"
|
||||
echo "• 9 MCP tools for card game functionality"
|
||||
echo "• FastAPI REST API (/api/v1/*)"
|
||||
echo "• Environment variable control (ENABLE_MCP=true/false)"
|
||||
echo "• Integration with ai.gpt MCP server"
|
||||
echo
|
||||
echo "Configuration:"
|
||||
echo "-------------"
|
||||
echo "• Virtual environment: $VENV_DIR"
|
||||
echo "• Config directory: ~/.config/syui/ai/card/"
|
||||
echo "• API documentation: http://localhost:8000/docs"
|
||||
echo "• MCP endpoint: http://localhost:8000/mcp"
|
||||
43
start_server.sh
Executable file
43
start_server.sh
Executable file
@ -0,0 +1,43 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
# ai.card MCP server startup script
|
||||
|
||||
# Configuration
|
||||
CARD_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
API_DIR="$CARD_DIR/api"
|
||||
VENV_DIR="$HOME/.config/syui/ai/card/venv"
|
||||
PYTHON="$VENV_DIR/bin/python"
|
||||
|
||||
# Default settings
|
||||
HOST="${HOST:-localhost}"
|
||||
PORT="${PORT:-8000}"
|
||||
RELOAD="${RELOAD:-true}"
|
||||
|
||||
echo "🎴 Starting ai.card MCP Server"
|
||||
echo "================================"
|
||||
echo "Directory: $API_DIR"
|
||||
echo "Python: $PYTHON"
|
||||
echo "Host: $HOST"
|
||||
echo "Port: $PORT"
|
||||
echo "Reload: $RELOAD"
|
||||
echo
|
||||
|
||||
# Check virtual environment
|
||||
if [ ! -f "$PYTHON" ]; then
|
||||
echo "❌ Error: Virtual environment not found at $VENV_DIR"
|
||||
echo "Please run ./setup_venv.sh first"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Change to API directory
|
||||
cd "$API_DIR"
|
||||
|
||||
# Start server
|
||||
if [ "$RELOAD" = "true" ]; then
|
||||
echo "🚀 Starting server with auto-reload..."
|
||||
exec "$PYTHON" -m uvicorn app.main:app --host "$HOST" --port "$PORT" --reload
|
||||
else
|
||||
echo "🚀 Starting server..."
|
||||
exec "$PYTHON" -m uvicorn app.main:app --host "$HOST" --port "$PORT"
|
||||
fi
|
||||
Reference in New Issue
Block a user