Merge pull request #67 from tensorplex-labs/dev

dev to staging
tensorplex-labs · Dec 20, 2024 · 0f321ec · 0f321ec
2 parents a582075 + 5141e1f
commit 0f321ec
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 221 deletions.
diff --git a/cmd/blockchain/main.go b/cmd/blockchain/main.go
diff --git a/pkg/api/controllers.go b/pkg/api/controllers.go
@@ -114,14 +114,6 @@ func WorkerLoginController(c *gin.Context) {
 func CreateTasksController(c *gin.Context) {
 	log.Info().Msg("Creating Tasks")
 
-	// Log the headers of the request
-	headers := c.Request.Header
-	log.Info().Interface("headers", headers).Msg("Request headers")
-
-	// Log the size of the request
-	requestSize := c.Request.ContentLength
-	log.Info().Int64("requestSize", requestSize).Msg("Request size")
-
 	log.Debug().Interface("request body", c.Request.Body).Msg("Creating tasks with request body")
 
 	minerUserInterface, exists := c.Get("minerUser")
@@ -157,8 +149,6 @@ func CreateTasksController(c *gin.Context) {
 		return
 	}
 
-	log.Info().Str("minerUser", fmt.Sprintf("%+v", minerUser)).Msg("Miner user found")
-
 	// Here we will handle file upload
 	// Parse files from the form
 	form, err := c.MultipartForm()
@@ -476,9 +466,6 @@ func GetTaskByIdController(c *gin.Context) {
 	taskID := c.Param("task-id")
 	taskService := task.NewTaskService()
 
-	// TODO: Remove this after testing
-	log.Info().Interface("Headers", c.Request.Header).Msg("Request Headers")
-
 	task, err := taskService.GetTaskResponseById(c.Request.Context(), taskID)
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, defaultErrorResponse("Internal server error"))

diff --git a/pkg/api/middlewares.go b/pkg/api/middlewares.go
@@ -336,6 +336,7 @@ func MinerAuthMiddleware() gin.HandlerFunc {
 
 		subnetState := blockchain.GetSubnetStateSubscriberInstance()
 		_, isFound := subnetState.FindMinerHotkeyIndex(foundApiKey.MinerUser().Hotkey)
+
 		if !isFound {
 			log.Error().Msg("Miner hotkey is deregistered")
 			c.AbortWithStatusJSON(http.StatusUnauthorized, defaultErrorResponse("Unauthorized"))

diff --git a/pkg/api/routes.go b/pkg/api/routes.go
@@ -23,7 +23,8 @@ func LoginRoutes(router *gin.Engine) {
 		tasks := apiV1.Group("/tasks")
 		{
 			tasks.PUT("/submit-result/:task-id", WriteTaskRateLimiter(), WorkerAuthMiddleware(), SubmitTaskResultController)
-			tasks.POST("/create-tasks", InMetagraphOnly(), WriteTaskRateLimiter(), MinerAuthMiddleware(), CreateTasksController)
+			// TODO: re-enable InMetagraphOnly() in future
+			tasks.POST("/create-tasks", WriteTaskRateLimiter(), MinerAuthMiddleware(), CreateTasksController)
 			tasks.GET("/task-result/:task-id", ReadTaskRateLimiter(), GetTaskResultsController)
 			tasks.GET("/:task-id", ReadTaskRateLimiter(), GetTaskByIdController)
 			tasks.GET("/next-task/:task-id", ReadTaskRateLimiter(), WorkerAuthMiddleware(), GetNextInProgressTaskController)

diff --git a/pkg/api/utils.go b/pkg/api/utils.go
@@ -184,14 +184,20 @@ func CustomGinLogger(logger *zerolog.Logger) gin.HandlerFunc {
 
 		logger := log.With().Logger().Output(consoleWriter)
 
+		// Log main request info
 		logger.Info().
-			Int("status_code", param.StatusCode).
-			Str("latency", param.Latency.String()).
-			Str("ip", param.ClientIP).
 			Str("method", param.Method).
 			Str("path", param.Path).
-			Int("resp_size", param.BodySize).
+			Int("status_code", param.StatusCode).
+			Str("latency", param.Latency.String()).
 			Int("req_size", len(body)).
+			Int("resp_size", param.BodySize).
+			Str("ip", param.ClientIP).
+			Msg("")
+
+		// Log headers separately
+		logger.Info().
+			Interface("headers", c.Request.Header).
 			Msg("")
 	}
 }