easy_ml 0.2.0.pre.rc37 → 0.2.0.pre.rc39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5b448944c0fdaf5d2228ec60facc66684e7664c650b8424624d218d5a2e3b3c
-  data.tar.gz: b12d622351ccad6b762cd49f840f73710e3c7369676f3535dd9f836fea7cce35
+  metadata.gz: a53f346d534b4333dcc9f8880c9d0fd4d14acf7a596be57caf42ea789490e4e4
+  data.tar.gz: 912b118a2c82f2397afce24d39a5c556d98fc58a310647de7232851f7ee606b4
 SHA512:
-  metadata.gz: 21829f0fbec8a65550132011b59681744090687c14c2fce5e0d189d4fd1ab05a3f8c5e2b1caeb6b2203336f170ec8c6d7d1751e12f047fd9b01bddb5e5ed61f9
-  data.tar.gz: 10ce9a5029cde22471c183d76399317a41ce90aa952593b5d2c59706202b5d93f1ec0dc10553121b7cb5001c4d1388836b7450d314ddfc0f064bfae8c645920a
+  metadata.gz: 4d641839d982e782d5921cc7086ef583f3ae0f5901446d0c132deacb5a7101b420428cbbb52f58b0a4f9a94fb3ed6cd7f72cb1705eb2c7c3c4f938c4a7e9702d
+  data.tar.gz: b19d313ece15cb343138f4d6e036947ba764708b80695ef6d7b502c45e3e34662dec959d8e1c1f423109f89ac87101b3383d64b80da3d32cc7e9bee7b30c6f5c

data/app/controllers/easy_ml/predictions_controller.rb

@@ -3,12 +3,23 @@ module EasyML
     skip_before_action :verify_authenticity_token, only: [:create]
 
     def create
+      unless params.key?(:input)
+        return render json: { error: "Must provide key: input" }, status: :not_found
+      end
+      input = params[:input].permit!.to_h
+
+      unless input.is_a?(Hash)
+        return render json: { error: "Input must be a hash" }, status: :not_found
+      end
+
       model_name = params[:model]
-      input = params[:input]
+      unless EasyML::Model.find_by(name: model_name).present?
+        return render json: { error: "Model not found" }, status: :not_found
+      end
 
-      predictions = EasyML::Predict.predict(model_name, input)
+      prediction = EasyML::Predict.predict(model_name, input)
 
-      render json: { prediction: predictions.first }
+      render json: { prediction: EasyML::PredictionSerializer.new(prediction).serializable_hash.dig(:data, :attributes) }, status: :ok
     rescue ActiveRecord::RecordNotFound
       render json: { error: "Model not found" }, status: :not_found
     rescue StandardError => e

data/app/frontend/types/datasource.ts

@@ -4,8 +4,7 @@ export type ColumnType =
   | "boolean"
   | "categorical"
   | "datetime"
-  | "text"
-  | "string";
+  | "text";
 
 export interface Schema {
   [key: string]: ColumnType;

data/app/serializers/easy_ml/prediction_serializer.rb

@@ -0,0 +1,16 @@
+require "jsonapi/serializer"
+
+module EasyML
+  class PredictionSerializer
+    include JSONAPI::Serializer
+
+    attribute :prediction do |object|
+      object.prediction_value.symbolize_keys.dig(:value)
+    end
+
+    attributes :id,
+               :prediction_type,
+               :raw_input,
+               :normalized_input
+  end
+end

data/bin/ecs/build

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+echo "Building web image"
+docker compose build web
+
+echo "Logging into AWS..."
+aws ecr get-login-password --region AWS_REGION | docker login --username AWS --password-stdin AWS_ACCOUNT.dkr.ecr.AWS_REGION.amazonaws.com
+
+echo "Tagging"
+docker tag easy_ml:web easy_ml:worker
+docker tag easy_ml:web easy_ml:zhong

data/bin/ecs/console

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -euo pipefail
+
+bin/ecs/exec_command.sh "bin/rails console"

data/bin/ecs/deploy

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+bin/ecs/build
+
+echo "Logging into AWS..."
+aws ecr get-login-password --region AWS_REGION | docker login --username AWS --password-stdin AWS_ACCOUNT.dkr.ecr.AWS_REGION.amazonaws.com
+
+echo "Tagging"
+docker tag easy_ml:web "$AWS_URL":web
+docker tag easy_ml:web "$AWS_URL":worker
+docker tag easy_ml:web "$AWS_URL":zhong
+
+echo "Pushing to remote..."
+docker push "$AWS_URL":web
+docker push "$AWS_URL":worker
+docker push "$AWS_URL":zhong

data/bin/ecs/exec_command.sh

@@ -0,0 +1,62 @@
+#!/usr/bin/env bash
+
+CLUSTER_NAME="CLUSTER_NAME"
+SERVICE_NAME="SERVICE_NAME"
+REGION="AWS_REGION"
+
+# Validate input
+if [ -z "$1" ]; then
+  echo "Usage: $0 <command>"
+  echo "Example: $0 /bin/bash"
+  exit 1
+fi
+
+# Command to run inside the container
+COMMAND="$1"
+
+# Step 1: Get the first task ARN
+TASK_ARN=$(aws ecs list-tasks \
+  --cluster "$CLUSTER_NAME" \
+  --service-name "$SERVICE_NAME" \
+  --region "$REGION" \
+  --query "taskArns[0]" \
+  --output text)
+
+if [ "$TASK_ARN" == "None" ]; then
+  echo "No running tasks found for service $SERVICE_NAME in cluster $CLUSTER_NAME."
+  exit 1
+fi
+
+# Step 2: Get container names in the task
+CONTAINER_NAMES=$(aws ecs describe-tasks \
+  --cluster "$CLUSTER_NAME" \
+  --tasks "$TASK_ARN" \
+  --region "$REGION" \
+  --query "tasks[0].containers[].name" \
+  --output text)
+
+# Check if containers exist
+if [ -z "$CONTAINER_NAMES" ]; then
+  echo "No containers found in the task $TASK_ARN."
+  exit 1
+fi
+
+# Step 3: Display container options and prompt user to choose
+echo "Containers available in the task:"
+select CONTAINER_NAME in $CONTAINER_NAMES; do
+  if [ -n "$CONTAINER_NAME" ]; then
+    echo "You selected container: $CONTAINER_NAME"
+    break
+  else
+    echo "Invalid selection. Please choose a valid container."
+  fi
+done
+
+# Step 4: Attach to the selected container and run the custom command
+echo "Attaching to container '$CONTAINER_NAME' in task '$TASK_ARN' and running command: $COMMAND..."
+aws ecs execute-command \
+  --cluster "$CLUSTER_NAME" \
+  --task "$TASK_ARN" \
+  --container "$CONTAINER_NAME" \
+  --command "$COMMAND" \
+  --interactive

data/bin/ecs/ssh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -euo pipefail
+
+bin/ecs/exec_command.sh "/bin/bash"

data/config/routes.rb

@@ -1,4 +1,5 @@
 require "zhong/web"
+require "resque/server"
 
 EasyML::Engine.routes.draw do
   root to: "models#index"

data/lib/easy_ml/data/polars_column.rb

@@ -8,9 +8,10 @@ module EasyML
         integer: Polars::Int64,
         boolean: Polars::Boolean,
         datetime: Polars::Datetime,
+        date: Polars::Date,
         string: Polars::String,
         text: Polars::String,
-        categorical: Polars::Categorical
+        categorical: Polars::Categorical,
       }
       POLARS_MAP = TYPE_MAP.invert.stringify_keys
       class << self
@@ -37,19 +38,21 @@ module EasyML
           end
 
           type_name = case dtype
-                      when Polars::Float64
-                        :float
-                      when Polars::Int64
-                        :integer
-                      when Polars::Datetime
-                        :datetime
-                      when Polars::Boolean
-                        :boolean
-                      when Polars::Utf8
-                        determine_string_type(series)
-                      else
-                        :categorical
-                      end
+            when Polars::Float64
+              :float
+            when Polars::Int64
+              :integer
+            when Polars::Datetime
+              :datetime
+            when Polars::Date
+              :date
+            when Polars::Boolean
+              :boolean
+            when Polars::Utf8
+              determine_string_type(series)
+            else
+              :categorical
+            end
 
           polars_type ? sym_to_polars(type_name) : type_name
         end

data/lib/easy_ml/predict.rb

@@ -29,8 +29,6 @@ module EasyML
         raw_input: raw_input,
         normalized_input: df.to_hashes&.first,
       )
-
-      preds
     end
 
     def self.train(model_name, tuner: nil, evaluator: nil)

data/lib/easy_ml/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module EasyML
-  VERSION = "0.2.0-rc37"
+  VERSION = "0.2.0-rc39"
 
   module Version
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_ml
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre.rc37
+  version: 0.2.0.pre.rc39
 platform: ruby
 authors:
 - Brett Shollenberger
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-22 00:00:00.000000000 Z
+date: 2025-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -594,6 +594,7 @@ files:
 - app/serializers/easy_ml/datasource_serializer.rb
 - app/serializers/easy_ml/feature_serializer.rb
 - app/serializers/easy_ml/model_serializer.rb
+- app/serializers/easy_ml/prediction_serializer.rb
 - app/serializers/easy_ml/retraining_job_serializer.rb
 - app/serializers/easy_ml/retraining_run_serializer.rb
 - app/serializers/easy_ml/settings_serializer.rb
@@ -601,6 +602,11 @@ files:
 - bin/build
 - bin/build_vite
 - bin/console
+- bin/ecs/build
+- bin/ecs/console
+- bin/ecs/deploy
+- bin/ecs/exec_command.sh
+- bin/ecs/ssh
 - bin/rspec
 - bin/setup
 - bin/vite