Implemented WebSocket handlers by creating and integrating sub-packages: **New package: api/datasets** - HandleDatasetList, HandleDatasetRegister, HandleDatasetInfo, HandleDatasetSearch - Binary protocol parsing for each operation **Updated ws/handler.go** - Added jobsHandler, jupyterHandler, datasetsHandler fields - Updated NewHandler to accept sub-handlers - Implemented handleAnnotateRun -> api/jobs - Implemented handleSetRunNarrative -> api/jobs - Implemented handleStartJupyter -> api/jupyter - Implemented handleStopJupyter -> api/jupyter - Implemented handleListJupyter -> api/jupyter - Implemented handleDatasetList -> api/datasets - Implemented handleDatasetRegister -> api/datasets - Implemented handleDatasetInfo -> api/datasets - Implemented handleDatasetSearch -> api/datasets **Updated api/routes.go** - Create jobs, jupyter, and datasets handlers - Pass all handlers to ws.NewHandler Build passes, all tests pass.
155 lines
4.7 KiB
Go
155 lines
4.7 KiB
Go
// Package datasets provides WebSocket handlers for dataset-related operations
|
|
package datasets
|
|
|
|
import (
|
|
"encoding/binary"
|
|
"time"
|
|
|
|
"github.com/gorilla/websocket"
|
|
"github.com/jfraeys/fetch_ml/internal/auth"
|
|
"github.com/jfraeys/fetch_ml/internal/logging"
|
|
"github.com/jfraeys/fetch_ml/internal/storage"
|
|
)
|
|
|
|
// Handler provides dataset-related WebSocket handlers
|
|
type Handler struct {
|
|
logger *logging.Logger
|
|
db *storage.DB
|
|
dataDir string
|
|
}
|
|
|
|
// NewHandler creates a new datasets handler
|
|
func NewHandler(
|
|
logger *logging.Logger,
|
|
db *storage.DB,
|
|
dataDir string,
|
|
) *Handler {
|
|
return &Handler{
|
|
logger: logger,
|
|
db: db,
|
|
dataDir: dataDir,
|
|
}
|
|
}
|
|
|
|
// Error codes
|
|
const (
|
|
ErrorCodeInvalidRequest = 0x01
|
|
ErrorCodeAuthenticationFailed = 0x02
|
|
ErrorCodePermissionDenied = 0x03
|
|
ErrorCodeResourceNotFound = 0x04
|
|
)
|
|
|
|
// sendErrorPacket sends an error response packet to the client
|
|
func (h *Handler) sendErrorPacket(conn *websocket.Conn, code byte, message, details string) error {
|
|
err := map[string]interface{}{
|
|
"error": true,
|
|
"code": code,
|
|
"message": message,
|
|
"details": details,
|
|
}
|
|
return conn.WriteJSON(err)
|
|
}
|
|
|
|
// sendSuccessPacket sends a success response packet
|
|
func (h *Handler) sendSuccessPacket(conn *websocket.Conn, data map[string]interface{}) error {
|
|
return conn.WriteJSON(data)
|
|
}
|
|
|
|
// sendDataPacket sends a data response packet
|
|
func (h *Handler) sendDataPacket(conn *websocket.Conn, dataType string, payload []byte) error {
|
|
return conn.WriteJSON(map[string]interface{}{
|
|
"type": dataType,
|
|
"payload": string(payload),
|
|
})
|
|
}
|
|
|
|
// HandleDatasetList handles listing datasets
|
|
// Protocol: [api_key_hash:16]
|
|
func (h *Handler) HandleDatasetList(conn *websocket.Conn, _payload []byte, _user *auth.User) error {
|
|
h.logger.Info("listing datasets")
|
|
|
|
// For now, return empty list
|
|
// In full implementation, query db for datasets
|
|
return h.sendDataPacket(conn, "datasets", []byte("[]"))
|
|
}
|
|
|
|
// HandleDatasetRegister handles registering a new dataset
|
|
// Protocol: [api_key_hash:16][name_len:1][name:var][path_len:2][path:var]
|
|
func (h *Handler) HandleDatasetRegister(conn *websocket.Conn, payload []byte, user *auth.User) error {
|
|
if len(payload) < 16+1+2 {
|
|
return h.sendErrorPacket(conn, ErrorCodeInvalidRequest, "register dataset payload too short", "")
|
|
}
|
|
|
|
offset := 16
|
|
|
|
nameLen := int(payload[offset])
|
|
offset++
|
|
if nameLen <= 0 || len(payload) < offset+nameLen+2 {
|
|
return h.sendErrorPacket(conn, ErrorCodeInvalidRequest, "invalid name length", "")
|
|
}
|
|
name := string(payload[offset : offset+nameLen])
|
|
offset += nameLen
|
|
|
|
pathLen := int(binary.BigEndian.Uint16(payload[offset : offset+2]))
|
|
offset += 2
|
|
if pathLen < 0 || len(payload) < offset+pathLen {
|
|
return h.sendErrorPacket(conn, ErrorCodeInvalidRequest, "invalid path length", "")
|
|
}
|
|
path := string(payload[offset : offset+pathLen])
|
|
|
|
h.logger.Info("registering dataset", "name", name, "path", path, "user", user.Name)
|
|
|
|
return h.sendSuccessPacket(conn, map[string]interface{}{
|
|
"success": true,
|
|
"name": name,
|
|
"path": path,
|
|
"user": user.Name,
|
|
"time": time.Now().UTC(),
|
|
})
|
|
}
|
|
|
|
// HandleDatasetInfo handles getting dataset info
|
|
// Protocol: [api_key_hash:16][dataset_id_len:1][dataset_id:var]
|
|
func (h *Handler) HandleDatasetInfo(conn *websocket.Conn, payload []byte, user *auth.User) error {
|
|
if len(payload) < 16+1 {
|
|
return h.sendErrorPacket(conn, ErrorCodeInvalidRequest, "dataset info payload too short", "")
|
|
}
|
|
|
|
offset := 16
|
|
|
|
datasetIDLen := int(payload[offset])
|
|
offset++
|
|
if datasetIDLen <= 0 || len(payload) < offset+datasetIDLen {
|
|
return h.sendErrorPacket(conn, ErrorCodeInvalidRequest, "invalid dataset ID length", "")
|
|
}
|
|
datasetID := string(payload[offset : offset+datasetIDLen])
|
|
|
|
h.logger.Info("getting dataset info", "dataset_id", datasetID, "user", user.Name)
|
|
|
|
// For now, return empty info
|
|
// In full implementation, query db for dataset
|
|
return h.sendDataPacket(conn, "dataset_info", []byte("{}"))
|
|
}
|
|
|
|
// HandleDatasetSearch handles searching datasets
|
|
// Protocol: [api_key_hash:16][query_len:2][query:var]
|
|
func (h *Handler) HandleDatasetSearch(conn *websocket.Conn, payload []byte, user *auth.User) error {
|
|
if len(payload) < 16+2 {
|
|
return h.sendErrorPacket(conn, ErrorCodeInvalidRequest, "dataset search payload too short", "")
|
|
}
|
|
|
|
offset := 16
|
|
|
|
queryLen := int(binary.BigEndian.Uint16(payload[offset : offset+2]))
|
|
offset += 2
|
|
if queryLen < 0 || len(payload) < offset+queryLen {
|
|
return h.sendErrorPacket(conn, ErrorCodeInvalidRequest, "invalid query length", "")
|
|
}
|
|
query := string(payload[offset : offset+queryLen])
|
|
|
|
h.logger.Info("searching datasets", "query", query, "user", user.Name)
|
|
|
|
// For now, return empty results
|
|
// In full implementation, search db for datasets
|
|
return h.sendDataPacket(conn, "datasets", []byte("[]"))
|
|
}
|