Fix OAuth page
This commit is contained in:
+112
-2
@@ -23,7 +23,7 @@ API_BASE = os.environ.get('TASKNEST_API_BASE_URL', 'http://127.0.0.1:1234/api/v1
|
||||
MCP_PUBLIC_URL = os.environ.get('TASKNEST_MCP_PUBLIC_URL', 'https://tasksnest.jorendegraaf.eu/mcp')
|
||||
OAUTH_ISSUER_URL = os.environ.get('TASKNEST_OAUTH_ISSUER_URL', 'https://tasksnest.jorendegraaf.eu/')
|
||||
MAX_IMAGE_BYTES = 5 * 1024 * 1024
|
||||
SUPPORTED_SCOPES = ['food:read', 'food:write', 'inventory:read', 'inventory:write']
|
||||
SUPPORTED_SCOPES = ['food:read', 'food:write', 'inventory:read', 'inventory:write', 'journal:read', 'journal:write']
|
||||
FILE_HOSTS = tuple(host.strip().lower().lstrip('.') for host in
|
||||
os.environ.get('TASKNEST_MCP_FILE_HOSTS', 'openai.com,oaiusercontent.com,chatgpt.com').split(',') if host.strip())
|
||||
CHATGPT_BLOB_HOST = 'oaisdmntprukwest.blob.core.windows.net'
|
||||
@@ -196,6 +196,52 @@ class RecipeAnalysisInput(BaseModel):
|
||||
substitutions: dict[str, str] = Field(default_factory=dict)
|
||||
|
||||
|
||||
class StressInput(BaseModel):
|
||||
score: int = Field(ge=0, le=10)
|
||||
recorded_at: str | None = None
|
||||
timing: Literal['anytime', 'before_sleep', 'after_waking'] = 'anytime'
|
||||
note: str = ''
|
||||
tags: list[str] = Field(default_factory=list)
|
||||
symptoms: list[Literal['tension', 'headache', 'fatigue', 'restlessness']] = Field(default_factory=list)
|
||||
|
||||
|
||||
class StressChanges(BaseModel):
|
||||
score: int | None = Field(default=None, ge=0, le=10)
|
||||
recorded_at: str | None = None
|
||||
timing: Literal['anytime', 'before_sleep', 'after_waking'] | None = None
|
||||
note: str | None = None
|
||||
tags: list[str] | None = None
|
||||
symptoms: list[Literal['tension', 'headache', 'fatigue', 'restlessness']] | None = None
|
||||
|
||||
|
||||
class DreamInput(BaseModel):
|
||||
wake_up_date: str
|
||||
title: str
|
||||
narrative: str
|
||||
dreamed_at: str | None = None
|
||||
interpretation: str = ''
|
||||
tags: list[str] = Field(default_factory=list)
|
||||
emotions: list[str] = Field(default_factory=list)
|
||||
vividness: int | None = Field(default=None, ge=0, le=10)
|
||||
is_nightmare: bool = False
|
||||
after_waking_notes: str = ''
|
||||
|
||||
|
||||
class DreamChanges(BaseModel):
|
||||
wake_up_date: str | None = None
|
||||
title: str | None = None
|
||||
narrative: str | None = None
|
||||
dreamed_at: str | None = None
|
||||
interpretation: str | None = None
|
||||
tags: list[str] | None = None
|
||||
emotions: list[str] | None = None
|
||||
vividness: int | None = Field(default=None, ge=0, le=10)
|
||||
is_nightmare: bool | None = None
|
||||
after_waking_notes: str | None = None
|
||||
append_narrative: str | None = None
|
||||
append_after_waking_notes: str | None = None
|
||||
|
||||
|
||||
def _token() -> str:
|
||||
access = get_access_token()
|
||||
if access is None:
|
||||
@@ -330,7 +376,7 @@ async def _attach(entry_id, image_base64, image_file, mime_type, filename, capti
|
||||
|
||||
|
||||
def create_server() -> MCPServer:
|
||||
server = MCPServer('TaskNest', description='Food diary and kitchen inventory for the authenticated TaskNest user.',
|
||||
server = MCPServer('TaskNest', description='Food, kitchen, and private stress and dream journals for the authenticated TaskNest user.',
|
||||
token_verifier=ApiTokenVerifier(), auth=AuthSettings(
|
||||
issuer_url=AnyHttpUrl(OAUTH_ISSUER_URL), resource_server_url=AnyHttpUrl(MCP_PUBLIC_URL),
|
||||
required_scopes=[], validate_token_resource=False))
|
||||
@@ -665,6 +711,70 @@ def create_server() -> MCPServer:
|
||||
payload=payload, idempotency_key=key)
|
||||
return {**data, 'idempotency_key': key}
|
||||
|
||||
@server.tool(structured_output=True, description='Search or list your private stress check-ins. Optional date is a local YYYY-MM-DD day; timing distinguishes before sleep from after waking. Read only.')
|
||||
async def stress_search(query: str = '', date: str | None = None,
|
||||
timing: Literal['anytime', 'before_sleep', 'after_waking'] | None = None,
|
||||
limit: int = 30, offset: int = 0) -> dict[str, Any]:
|
||||
params = {'query': query, 'limit': min(max(limit, 1), 100), 'offset': max(offset, 0)}
|
||||
if date is not None:
|
||||
params['date'] = date
|
||||
if timing is not None:
|
||||
params['timing'] = timing
|
||||
return await api_request('GET', 'stress/', params=params)
|
||||
|
||||
@server.tool(structured_output=True, description='Read one stress check-in owned by the authenticated user using its ID. Read only.')
|
||||
async def stress_get(entry_id: str) -> dict[str, Any]:
|
||||
return await api_request('GET', f'stress/{entry_id}/')
|
||||
|
||||
@server.tool(structured_output=True, description='Create a private 0–10 stress check-in. Use before_sleep for stress before sleeping and after_waking for stress noticed after waking; do not conflate the two. Reuse idempotency_key on retries and update the returned ID for follow-up details.')
|
||||
async def stress_create(entry: StressInput, idempotency_key: str | None = None) -> dict[str, Any]:
|
||||
key = _key(idempotency_key)
|
||||
data = await api_request('POST', 'stress/', payload=entry.model_dump(mode='json', exclude_none=True),
|
||||
idempotency_key=key)
|
||||
return {**data, 'idempotency_key': key}
|
||||
|
||||
@server.tool(structured_output=True, description='Update only supplied fields of one owned stress check-in. Use for conversational corrections or adding details to the existing ID instead of creating a duplicate.')
|
||||
async def stress_update(entry_id: str, changes: StressChanges) -> dict[str, Any]:
|
||||
return await api_request('PATCH', f'stress/{entry_id}/',
|
||||
payload=changes.model_dump(mode='json', exclude_unset=True))
|
||||
|
||||
@server.tool(structured_output=True, description='Permanently delete one owned stress check-in. Require the user’s clear intent.')
|
||||
async def stress_delete(entry_id: str) -> dict[str, Any]:
|
||||
return await api_request('DELETE', f'stress/{entry_id}/')
|
||||
|
||||
@server.tool(structured_output=True, description='List or search your private dreams by keywords, tag, wake-up date or date range. Dates are local YYYY-MM-DD wake-up dates matching Health > Sleep. Read only.')
|
||||
async def dream_search(query: str = '', tag: str = '', date: str | None = None,
|
||||
date_from: str | None = None, date_to: str | None = None,
|
||||
limit: int = 30, offset: int = 0) -> dict[str, Any]:
|
||||
params = {'query': query, 'tag': tag, 'limit': min(max(limit, 1), 100), 'offset': max(offset, 0)}
|
||||
for key, value in [('date', date), ('date_from', date_from), ('date_to', date_to)]:
|
||||
if value is not None:
|
||||
params[key] = value
|
||||
return await api_request('GET', 'dreams/', params=params)
|
||||
|
||||
@server.tool(structured_output=True, description='Read one private dream entry by ID, including its original narrative and separately stored interpretation. Read only.')
|
||||
async def dream_get(entry_id: str) -> dict[str, Any]:
|
||||
return await api_request('GET', f'dreams/{entry_id}/')
|
||||
|
||||
@server.tool(structured_output=True, description='Create a private dream for its wake-up date. Record only details supplied by the user; do not invent or interpret. Use the returned ID for follow-ups and reuse idempotency_key on retries.')
|
||||
async def dream_create(entry: DreamInput, idempotency_key: str | None = None) -> dict[str, Any]:
|
||||
key = _key(idempotency_key)
|
||||
data = await api_request('POST', 'dreams/', payload=entry.model_dump(mode='json', exclude_none=True),
|
||||
idempotency_key=key)
|
||||
return {**data, 'idempotency_key': key}
|
||||
|
||||
@server.tool(structured_output=True, description='Update or append user-supplied corrections to an existing owned dream ID. For append fields, reuse idempotency_key on retries; follow-ups must not create duplicate dreams.')
|
||||
async def dream_update(entry_id: str, changes: DreamChanges,
|
||||
idempotency_key: str | None = None) -> dict[str, Any]:
|
||||
payload = changes.model_dump(mode='json', exclude_unset=True)
|
||||
key = _key(idempotency_key) if any(name.startswith('append_') for name in payload) else idempotency_key
|
||||
data = await api_request('PATCH', f'dreams/{entry_id}/', payload=payload, idempotency_key=key)
|
||||
return {**data, **({'idempotency_key': key} if key else {})}
|
||||
|
||||
@server.tool(structured_output=True, description='Permanently delete an owned dream entry by ID. Require the user’s clear intent.')
|
||||
async def dream_delete(entry_id: str) -> dict[str, Any]:
|
||||
return await api_request('DELETE', f'dreams/{entry_id}/')
|
||||
|
||||
return server
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user