feat: train proxy and correct staffing peak fixture
This commit is contained in:
1 parent
f284969a4b
commit
4b9c2da9f7
7 files changed
+575
-10
No files matched your search
@@ -9,6 +9,7 @@ import (
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
@@ -18,10 +19,15 @@ import (
|
||||
// DefaultTimeout is the contract limit for a live prediction.
|
||||
const DefaultTimeout = 1500 * time.Millisecond
|
||||
|
||||
// controlTimeout bounds training submissions and status reads. Uploads are
|
||||
// larger than prediction payloads, so they get more than DefaultTimeout.
|
||||
const controlTimeout = 30 * time.Second
|
||||
|
||||
// Client talks to the FastAPI ML service.
|
||||
type Client struct {
|
||||
baseURL string
|
||||
http *http.Client
|
||||
control *http.Client
|
||||
}
|
||||
|
||||
// New returns a client for baseURL (for example http://localhost:8000).
|
||||
@@ -32,6 +38,7 @@ func New(baseURL string, timeout time.Duration) *Client {
|
||||
return &Client{
|
||||
baseURL: strings.TrimRight(baseURL, "/"),
|
||||
http: &http.Client{Timeout: timeout},
|
||||
control: &http.Client{Timeout: controlTimeout},
|
||||
}
|
||||
}
|
||||
|
||||
@@ -57,6 +64,15 @@ type SimulateRequest struct {
|
||||
Sensors string `json:"sensors"`
|
||||
}
|
||||
|
||||
// TrainRequest is the JSON form of POST /train.
|
||||
type TrainRequest struct {
|
||||
Path string `json:"path"`
|
||||
Model string `json:"model"`
|
||||
}
|
||||
|
||||
// TrainModels are the accepted training targets from CONTRACT.md §3.
|
||||
var TrainModels = []string{"small", "forecast"}
|
||||
|
||||
// Predict calls POST /predict and returns the forecast points. The contract
|
||||
// response is {"points":[...]}; a bare array is accepted as well.
|
||||
func (c *Client) Predict(ctx context.Context, req PredictRequest) ([]model.ForecastPoint, error) {
|
||||
@@ -99,6 +115,44 @@ func (c *Client) Simulate(ctx context.Context, req SimulateRequest) (map[string]
|
||||
return out.Forecasts, nil
|
||||
}
|
||||
|
||||
// Train proxies POST /train. body is forwarded verbatim (JSON or multipart),
|
||||
// and the upstream status and response are returned unchanged for the Go
|
||||
// handler to relay. Training itself runs in FastAPI; this call only queues it.
|
||||
func (c *Client) Train(ctx context.Context, contentType string, body io.Reader) (int, []byte, error) {
|
||||
return c.controlRequest(ctx, http.MethodPost, "/train", contentType, body)
|
||||
}
|
||||
|
||||
// TrainStatus proxies GET /train/{job_id}.
|
||||
func (c *Client) TrainStatus(ctx context.Context, jobID string) (int, []byte, error) {
|
||||
return c.controlRequest(ctx, http.MethodGet, "/train/"+url.PathEscape(jobID), "", nil)
|
||||
}
|
||||
|
||||
// controlRequest performs a training/control request and returns the raw
|
||||
// upstream status and body. Non-2xx responses are not errors: the proxy
|
||||
// forwards them so clients see FastAPI's 400/404/409 semantics.
|
||||
func (c *Client) controlRequest(ctx context.Context, method, path, contentType string, body io.Reader) (int, []byte, error) {
|
||||
req, err := http.NewRequestWithContext(ctx, method, c.baseURL+path, body)
|
||||
if err != nil {
|
||||
return 0, nil, fmt.Errorf("ml: build request: %w", err)
|
||||
}
|
||||
if contentType != "" {
|
||||
req.Header.Set("Content-Type", contentType)
|
||||
}
|
||||
req.Header.Set("Accept", "application/json")
|
||||
|
||||
resp, err := c.control.Do(req)
|
||||
if err != nil {
|
||||
return 0, nil, fmt.Errorf("ml: %s: %w", path, err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
raw, err := io.ReadAll(io.LimitReader(resp.Body, 32<<20))
|
||||
if err != nil {
|
||||
return 0, nil, fmt.Errorf("ml: read %s: %w", path, err)
|
||||
}
|
||||
return resp.StatusCode, raw, nil
|
||||
}
|
||||
|
||||
func (c *Client) post(ctx context.Context, path string, body, dst any) error {
|
||||
raw, err := c.postRaw(ctx, path, body)
|
||||
if err != nil {
|
||||
|
||||
Reference in new issue
Block a user