feat: API skeleton, SSE, staffing and tests
This commit is contained in:
1 parent
907164f972
commit
f284969a4b
14 files changed
+1355
-54
No files matched your search
+40
-24
@@ -52,39 +52,43 @@ type WeatherInput struct {
|
||||
|
||||
// SimulateRequest mirrors CONTRACT.md §3 POST /simulate.
|
||||
type SimulateRequest struct {
|
||||
Scenario string `json:"scenario"`
|
||||
Scenario string `json:"scenario"`
|
||||
Weather model.WeatherInput `json:"weather"`
|
||||
Sensors string `json:"sensors"`
|
||||
Sensors string `json:"sensors"`
|
||||
}
|
||||
|
||||
// Predict calls POST /predict and returns the forecast points.
|
||||
// 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) {
|
||||
raw, err := c.postRaw(ctx, "/predict", req)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var out struct {
|
||||
Points []model.ForecastPoint `json:"points"`
|
||||
}
|
||||
if err := c.post(ctx, "/predict", req, &out); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if out.Points == nil {
|
||||
// The contract says "the same points array"; accept a bare array too.
|
||||
var points []model.ForecastPoint
|
||||
if err := c.post(ctx, "/predict", req, &points); err == nil && len(points) > 0 {
|
||||
out.Points = points
|
||||
if err := json.Unmarshal(raw, &out); err == nil && out.Points != nil {
|
||||
if len(out.Points) == 0 {
|
||||
return nil, fmt.Errorf("ml: predict returned no points")
|
||||
}
|
||||
return out.Points, nil
|
||||
}
|
||||
if len(out.Points) == 0 {
|
||||
return nil, fmt.Errorf("ml: predict returned no points")
|
||||
|
||||
var points []model.ForecastPoint
|
||||
if err := json.Unmarshal(raw, &points); err == nil && len(points) > 0 {
|
||||
return points, nil
|
||||
}
|
||||
return out.Points, nil
|
||||
return nil, fmt.Errorf("ml: predict returned no points")
|
||||
}
|
||||
|
||||
// Simulate calls POST /simulate and returns forecasts keyed
|
||||
// sensor -> horizon -> points.
|
||||
func (c *Client) Simulate(ctx context.Context, req SimulateRequest) (map[string]map[string][]model.ForecastPoint, error) {
|
||||
var out struct {
|
||||
Scenario string `json:"scenario"`
|
||||
Generated string `json:"generated_at"`
|
||||
Forecasts map[string]map[string][]model.ForecastPoint `json:"forecasts"`
|
||||
Scenario string `json:"scenario"`
|
||||
Generated string `json:"generated_at"`
|
||||
Forecasts map[string]map[string][]model.ForecastPoint `json:"forecasts"`
|
||||
}
|
||||
if err := c.post(ctx, "/simulate", req, &out); err != nil {
|
||||
return nil, err
|
||||
@@ -96,29 +100,41 @@ func (c *Client) Simulate(ctx context.Context, req SimulateRequest) (map[string]
|
||||
}
|
||||
|
||||
func (c *Client) post(ctx context.Context, path string, body, dst any) error {
|
||||
raw, err := c.postRaw(ctx, path, body)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if err := json.Unmarshal(raw, dst); err != nil {
|
||||
return fmt.Errorf("ml: decode %s: %w", path, err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *Client) postRaw(ctx context.Context, path string, body any) ([]byte, error) {
|
||||
raw, err := json.Marshal(body)
|
||||
if err != nil {
|
||||
return fmt.Errorf("ml: encode request: %w", err)
|
||||
return nil, fmt.Errorf("ml: encode request: %w", err)
|
||||
}
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodPost, c.baseURL+path, bytes.NewReader(raw))
|
||||
if err != nil {
|
||||
return fmt.Errorf("ml: build request: %w", err)
|
||||
return nil, fmt.Errorf("ml: build request: %w", err)
|
||||
}
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
req.Header.Set("Accept", "application/json")
|
||||
|
||||
resp, err := c.http.Do(req)
|
||||
if err != nil {
|
||||
return fmt.Errorf("ml: %s: %w", path, err)
|
||||
return nil, fmt.Errorf("ml: %s: %w", path, err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
if resp.StatusCode < 200 || resp.StatusCode > 299 {
|
||||
snippet, _ := io.ReadAll(io.LimitReader(resp.Body, 256))
|
||||
return fmt.Errorf("ml: %s: status %d: %s", path, resp.StatusCode, strings.TrimSpace(string(snippet)))
|
||||
return nil, fmt.Errorf("ml: %s: status %d: %s", path, resp.StatusCode, strings.TrimSpace(string(snippet)))
|
||||
}
|
||||
if err := json.NewDecoder(io.LimitReader(resp.Body, 32<<20)).Decode(dst); err != nil {
|
||||
return fmt.Errorf("ml: decode %s: %w", path, err)
|
||||
raw, err = io.ReadAll(io.LimitReader(resp.Body, 32<<20))
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("ml: read %s: %w", path, err)
|
||||
}
|
||||
return nil
|
||||
return raw, nil
|
||||
}
|
||||
Reference in new issue
Block a user