The frontend is rebuilt screen by screen from the handoff: warm cream ground, terracotta + sage accents, Caprasimo over Figtree, every control a pill. Same React/Vite/TanStack stack and the same lib/ data layer; the presentation is new. - Tokens: web/src/styles/index.css declares the handoff's styles.css variables through Tailwind's @theme under the same names; dark mode is those variables overridden on <html> by the handoff's pansy-theme.js, inlined in index.html so it runs before first paint. Lucide glyphs at stroke 2.75; a small pill kit (Button, Dialog, Field, Seg, Toggle, Tag, toast). - Login / Register: the centered column over soft accent circles; OIDC button and signup footer still follow /auth/providers. - Gardens: cards with a real SVG plot thumbnail (objects + plant-colored dots from /full), a `plan` tag for "<name> — <year>" copies, shares line, Open + share/copy/edit/delete; New garden / Share / Plan-a-season dialogs. - Plants: monogram markers derived from the name (collision-resolved across the catalog — replaces emoji icons), category chips, expandable lot cards, the scan-packet flow as a two-step dialog that never auto-creates. - Settings: Appearance (theme seg), Who gets in (read-only sign-in config), Garden assistant (self-saving toggle + chat/vision model fields), You. - Editor: a new canvas with the prototype's pointer model (wheel-to-cursor, pinch about the centroid, 3″ snap, one PATCH per drop, semantic-zoom monograms/labels), plus corner resize handles; desktop three-card workspace (toolkit | plan | rail with Plot/Journal/History/Assistant) and, below 760px of container width, the phone chrome (header, peek panel, tool strip, mode bar). Seasons as a segmented control over the years with data plus plan copies; Undo re-reads history before reverting the newest step. - Public read-only view and the register page restyled to match. - GET /settings gains a read-only `auth` view (registration mode, local auth, OIDC issuer) so the Settings page can show what's in force. - README / DESIGN.md / CLAUDE.md updated; @use-gesture/react dropped. Co-Authored-By: Claude Fable 5 <[email protected]>
181 lines
6.7 KiB
Go
181 lines
6.7 KiB
Go
package api
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"net/http"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
|
|
"gitea.stevedudenhoeffer.com/steve/pansy/internal/domain"
|
|
"gitea.stevedudenhoeffer.com/steve/pansy/internal/service"
|
|
)
|
|
|
|
// Instance settings (#79): admin-only, instance-wide. The authoritative admin
|
|
// check is in the service; requireAdmin here is a cheap early 403 that also
|
|
// keeps the route group readable.
|
|
|
|
// requireAdmin rejects a non-admin actor. It runs after requireAuth, so the
|
|
// actor is already resolved and carries IsAdmin — no extra query. Returns 403
|
|
// (not 404): a logged-in user knows settings exist, they just may not touch them.
|
|
func (h *handlers) requireAdmin() gin.HandlerFunc {
|
|
return func(c *gin.Context) {
|
|
if !mustActor(c).IsAdmin {
|
|
writeAPIError(c, http.StatusForbidden, "FORBIDDEN", "admin access required")
|
|
c.Abort()
|
|
return
|
|
}
|
|
c.Next()
|
|
}
|
|
}
|
|
|
|
// settingsResponse is what GET/PATCH /settings return. It carries the stored
|
|
// settings plus a read-only view of what's resolved and live, so the UI can show
|
|
// "inheriting ollama-cloud/glm-5.2:cloud from the environment" and whether a key
|
|
// is present — without ever exposing the key itself.
|
|
type settingsResponse struct {
|
|
Settings *domain.InstanceSettings `json:"settings"`
|
|
// Effective is the configuration actually in force after layering settings
|
|
// over the environment.
|
|
Effective effectiveView `json:"effective"`
|
|
// Auth is the sign-in configuration, read-only (see authView).
|
|
Auth authView `json:"auth"`
|
|
}
|
|
|
|
// authView is the environment-driven sign-in configuration the Settings page
|
|
// shows under "Who gets in": PANSY_REGISTRATION, PANSY_LOCAL_AUTH and the OIDC
|
|
// issuer. It is reported so an admin can see what is in force without shell
|
|
// access; none of it is editable at runtime (auth policy deploys with the
|
|
// environment on purpose — see README). Only the issuer URL is exposed, never
|
|
// the client id or secret.
|
|
type authView struct {
|
|
// Registration is "open" or "closed" — whether local self-service signup is
|
|
// allowed. OIDC provisioning ignores it (the IdP gates access).
|
|
Registration string `json:"registration"`
|
|
// LocalAuth is whether email/password sign-in is offered at all.
|
|
LocalAuth bool `json:"localAuth"`
|
|
// OIDC is whether single sign-on is fully configured; OIDCIssuer is the
|
|
// discovery URL as configured (may be set while OIDC is still incomplete).
|
|
OIDC bool `json:"oidc"`
|
|
OIDCIssuer string `json:"oidcIssuer"`
|
|
OIDCLabel string `json:"oidcLabel"`
|
|
}
|
|
|
|
type effectiveView struct {
|
|
Model string `json:"model"`
|
|
Enabled bool `json:"enabled"`
|
|
// HasApiKey reports whether OLLAMA_CLOUD_API_KEY is set. The key itself is
|
|
// never serialized — an admin may know one exists, not what it is.
|
|
HasApiKey bool `json:"hasApiKey"`
|
|
// AgentLive is whether the assistant Runner is actually built right now. It
|
|
// can be false even when Enabled+HasApiKey are true (an unresolvable model),
|
|
// which is exactly the case the UI needs to surface.
|
|
AgentLive bool `json:"agentLive"`
|
|
// VisionModel is the resolved seed-packet model (DB-over-env). VisionReady is
|
|
// whether capture can actually be offered (a key and a model).
|
|
VisionModel string `json:"visionModel"`
|
|
VisionReady bool `json:"visionReady"`
|
|
}
|
|
|
|
// settingsPayload builds the response, or an error. It does NOT swallow an
|
|
// EffectiveConfig failure into a misleading empty "effective" view — an empty
|
|
// view would report no model and no key, which reads as "nothing configured"
|
|
// rather than "we couldn't read it". Since EffectiveConfig re-reads the same row
|
|
// GetInstanceSettings just returned, a failure here is a genuine DB fault worth
|
|
// surfacing as a 500, not papering over. It also resolves the agent and vision
|
|
// views from ONE row read rather than fetching the single-row table twice.
|
|
func (h *handlers) settingsPayload(c *gin.Context, st *domain.InstanceSettings) (settingsResponse, error) {
|
|
eff, vis, err := h.svc.EffectiveConfig(c.Request.Context())
|
|
if err != nil {
|
|
return settingsResponse{}, err
|
|
}
|
|
return settingsResponse{
|
|
Settings: st,
|
|
Effective: effectiveView{
|
|
Model: eff.Model,
|
|
Enabled: eff.Enabled,
|
|
HasApiKey: eff.APIKey != "",
|
|
AgentLive: h.agent.get() != nil,
|
|
VisionModel: vis.Model,
|
|
VisionReady: vis.Ready(),
|
|
},
|
|
Auth: authView{
|
|
Registration: h.cfg.Registration,
|
|
LocalAuth: h.cfg.LocalAuth,
|
|
OIDC: h.cfg.OIDCReady(),
|
|
OIDCIssuer: h.cfg.OIDC.Issuer,
|
|
OIDCLabel: h.cfg.OIDC.ButtonLabel,
|
|
},
|
|
}, nil
|
|
}
|
|
|
|
func (h *handlers) getSettings(c *gin.Context) {
|
|
st, err := h.svc.GetInstanceSettings(c.Request.Context(), mustActor(c).ID)
|
|
if err != nil {
|
|
writeServiceError(c, err)
|
|
return
|
|
}
|
|
payload, err := h.settingsPayload(c, st)
|
|
if err != nil {
|
|
writeServiceError(c, err)
|
|
return
|
|
}
|
|
c.JSON(http.StatusOK, payload)
|
|
}
|
|
|
|
// settingsUpdateRequest is the PATCH body. agentModel "" means inherit the env
|
|
// var. agentEnabled is json.RawMessage so an explicit null (inherit) is
|
|
// distinguishable from an absent field and from true/false.
|
|
type settingsUpdateRequest struct {
|
|
AgentModel string `json:"agentModel"`
|
|
AgentEnabled json.RawMessage `json:"agentEnabled"`
|
|
VisionModel string `json:"visionModel"`
|
|
Version int64 `json:"version" binding:"required"`
|
|
}
|
|
|
|
func (h *handlers) updateSettings(c *gin.Context) {
|
|
var req settingsUpdateRequest
|
|
if err := c.ShouldBindJSON(&req); err != nil {
|
|
writeAPIError(c, http.StatusBadRequest, "INVALID_INPUT", "a current version is required")
|
|
return
|
|
}
|
|
|
|
// agentEnabled: absent or null → inherit (nil); true/false → explicit override.
|
|
// The shared parseNullable does exactly this three-way decode; present is
|
|
// irrelevant here because absent and null both mean "inherit".
|
|
enabled, _, err := parseNullable[bool](req.AgentEnabled)
|
|
if err != nil {
|
|
writeAPIError(c, http.StatusBadRequest, "INVALID_INPUT", "agentEnabled must be true, false, or null")
|
|
return
|
|
}
|
|
|
|
st, err := h.svc.UpdateInstanceSettings(c.Request.Context(), mustActor(c).ID, service.InstanceSettingsPatch{
|
|
AgentModel: req.AgentModel,
|
|
AgentEnabled: enabled,
|
|
VisionModel: req.VisionModel,
|
|
Version: req.Version,
|
|
})
|
|
if err != nil {
|
|
if errors.Is(err, domain.ErrVersionConflict) {
|
|
writeVersionConflict(c, st)
|
|
return
|
|
}
|
|
writeServiceError(c, err)
|
|
return
|
|
}
|
|
|
|
// Apply the change to the LIVE assistant. Detached from the request context:
|
|
// the write is committed and the rebuild describes it, so a client that hangs
|
|
// up now must not leave the running Runner out of step with the stored
|
|
// settings. Mirrors the same reasoning as the history-write detachment.
|
|
h.agent.rebuild(context.WithoutCancel(c.Request.Context()))
|
|
|
|
payload, err := h.settingsPayload(c, st)
|
|
if err != nil {
|
|
writeServiceError(c, err)
|
|
return
|
|
}
|
|
c.JSON(http.StatusOK, payload)
|
|
}
|