From c06f2d30f2f650d3a5bbdef919e8ac82dae36a06 Mon Sep 17 00:00:00 2001 From: Fei-Guo Date: Wed, 6 Nov 2024 14:10:18 -0800 Subject: [PATCH] chore: restruct workspace controller code - part 1 --- cmd/workspace/main.go | 2 +- pkg/{ => workspace}/controllers/workspace_controller.go | 2 +- pkg/{ => workspace}/controllers/workspace_controller_test.go | 0 pkg/{ => workspace}/controllers/workspace_gc_finalizer.go | 0 .../controllers/workspace_gc_finalizer_test.go | 0 pkg/{ => workspace}/controllers/workspace_status.go | 0 pkg/{ => workspace}/controllers/workspace_status_test.go | 0 pkg/{ => workspace}/inference/preset-inference-types.go | 0 pkg/{ => workspace}/inference/preset-inferences.go | 0 pkg/{ => workspace}/inference/preset-inferences_test.go | 0 pkg/{ => workspace}/inference/template_inference.go | 0 pkg/{ => workspace}/inference/template_inference_test.go | 0 presets/models/falcon/model.go | 5 +++-- presets/models/llama2/model.go | 2 +- presets/models/llama2chat/model.go | 2 +- presets/models/mistral/model.go | 2 +- presets/models/phi2/model.go | 2 +- presets/models/phi3/model.go | 2 +- 18 files changed, 10 insertions(+), 9 deletions(-) rename pkg/{ => workspace}/controllers/workspace_controller.go (99%) rename pkg/{ => workspace}/controllers/workspace_controller_test.go (100%) rename pkg/{ => workspace}/controllers/workspace_gc_finalizer.go (100%) rename pkg/{ => workspace}/controllers/workspace_gc_finalizer_test.go (100%) rename pkg/{ => workspace}/controllers/workspace_status.go (100%) rename pkg/{ => workspace}/controllers/workspace_status_test.go (100%) rename pkg/{ => workspace}/inference/preset-inference-types.go (100%) rename pkg/{ => workspace}/inference/preset-inferences.go (100%) rename pkg/{ => workspace}/inference/preset-inferences_test.go (100%) rename pkg/{ => workspace}/inference/template_inference.go (100%) rename pkg/{ => workspace}/inference/template_inference_test.go (100%) diff --git a/cmd/workspace/main.go b/cmd/workspace/main.go index 1db35bf6d..32c846cc6 100644 --- a/cmd/workspace/main.go +++ b/cmd/workspace/main.go @@ -21,8 +21,8 @@ import ( "sigs.k8s.io/karpenter/pkg/apis/v1beta1" "github.com/aws/karpenter-core/pkg/apis/v1alpha5" - "github.com/kaito-project/kaito/pkg/controllers" "github.com/kaito-project/kaito/pkg/webhooks" + "github.com/kaito-project/kaito/pkg/workspace/controllers" "k8s.io/klog/v2" "knative.dev/pkg/injection/sharedmain" "knative.dev/pkg/webhook" diff --git a/pkg/controllers/workspace_controller.go b/pkg/workspace/controllers/workspace_controller.go similarity index 99% rename from pkg/controllers/workspace_controller.go rename to pkg/workspace/controllers/workspace_controller.go index 0fb9a9f67..1ad5bc93a 100644 --- a/pkg/controllers/workspace_controller.go +++ b/pkg/workspace/controllers/workspace_controller.go @@ -26,11 +26,11 @@ import ( "github.com/aws/karpenter-core/pkg/apis/v1alpha5" "github.com/go-logr/logr" kaitov1alpha1 "github.com/kaito-project/kaito/api/v1alpha1" - "github.com/kaito-project/kaito/pkg/inference" "github.com/kaito-project/kaito/pkg/machine" "github.com/kaito-project/kaito/pkg/resources" "github.com/kaito-project/kaito/pkg/utils" "github.com/kaito-project/kaito/pkg/utils/plugin" + "github.com/kaito-project/kaito/pkg/workspace/inference" "github.com/samber/lo" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controllers/workspace_controller_test.go b/pkg/workspace/controllers/workspace_controller_test.go similarity index 100% rename from pkg/controllers/workspace_controller_test.go rename to pkg/workspace/controllers/workspace_controller_test.go diff --git a/pkg/controllers/workspace_gc_finalizer.go b/pkg/workspace/controllers/workspace_gc_finalizer.go similarity index 100% rename from pkg/controllers/workspace_gc_finalizer.go rename to pkg/workspace/controllers/workspace_gc_finalizer.go diff --git a/pkg/controllers/workspace_gc_finalizer_test.go b/pkg/workspace/controllers/workspace_gc_finalizer_test.go similarity index 100% rename from pkg/controllers/workspace_gc_finalizer_test.go rename to pkg/workspace/controllers/workspace_gc_finalizer_test.go diff --git a/pkg/controllers/workspace_status.go b/pkg/workspace/controllers/workspace_status.go similarity index 100% rename from pkg/controllers/workspace_status.go rename to pkg/workspace/controllers/workspace_status.go diff --git a/pkg/controllers/workspace_status_test.go b/pkg/workspace/controllers/workspace_status_test.go similarity index 100% rename from pkg/controllers/workspace_status_test.go rename to pkg/workspace/controllers/workspace_status_test.go diff --git a/pkg/inference/preset-inference-types.go b/pkg/workspace/inference/preset-inference-types.go similarity index 100% rename from pkg/inference/preset-inference-types.go rename to pkg/workspace/inference/preset-inference-types.go diff --git a/pkg/inference/preset-inferences.go b/pkg/workspace/inference/preset-inferences.go similarity index 100% rename from pkg/inference/preset-inferences.go rename to pkg/workspace/inference/preset-inferences.go diff --git a/pkg/inference/preset-inferences_test.go b/pkg/workspace/inference/preset-inferences_test.go similarity index 100% rename from pkg/inference/preset-inferences_test.go rename to pkg/workspace/inference/preset-inferences_test.go diff --git a/pkg/inference/template_inference.go b/pkg/workspace/inference/template_inference.go similarity index 100% rename from pkg/inference/template_inference.go rename to pkg/workspace/inference/template_inference.go diff --git a/pkg/inference/template_inference_test.go b/pkg/workspace/inference/template_inference_test.go similarity index 100% rename from pkg/inference/template_inference_test.go rename to pkg/workspace/inference/template_inference_test.go diff --git a/presets/models/falcon/model.go b/presets/models/falcon/model.go index e73c7c3db..83b5a8cac 100644 --- a/presets/models/falcon/model.go +++ b/presets/models/falcon/model.go @@ -3,13 +3,14 @@ package falcon import ( - "github.com/kaito-project/kaito/pkg/tuning" "time" + "github.com/kaito-project/kaito/pkg/tuning" + kaitov1alpha1 "github.com/kaito-project/kaito/api/v1alpha1" - "github.com/kaito-project/kaito/pkg/inference" "github.com/kaito-project/kaito/pkg/model" "github.com/kaito-project/kaito/pkg/utils/plugin" + "github.com/kaito-project/kaito/pkg/workspace/inference" ) func init() { diff --git a/presets/models/llama2/model.go b/presets/models/llama2/model.go index 39a03a3d2..7a81d679f 100644 --- a/presets/models/llama2/model.go +++ b/presets/models/llama2/model.go @@ -6,9 +6,9 @@ import ( "time" kaitov1alpha1 "github.com/kaito-project/kaito/api/v1alpha1" - "github.com/kaito-project/kaito/pkg/inference" "github.com/kaito-project/kaito/pkg/model" "github.com/kaito-project/kaito/pkg/utils/plugin" + "github.com/kaito-project/kaito/pkg/workspace/inference" ) func init() { diff --git a/presets/models/llama2chat/model.go b/presets/models/llama2chat/model.go index 8c3692e29..735ecc013 100644 --- a/presets/models/llama2chat/model.go +++ b/presets/models/llama2chat/model.go @@ -6,9 +6,9 @@ import ( "time" kaitov1alpha1 "github.com/kaito-project/kaito/api/v1alpha1" - "github.com/kaito-project/kaito/pkg/inference" "github.com/kaito-project/kaito/pkg/model" "github.com/kaito-project/kaito/pkg/utils/plugin" + "github.com/kaito-project/kaito/pkg/workspace/inference" ) func init() { diff --git a/presets/models/mistral/model.go b/presets/models/mistral/model.go index 1ee039b72..51a23b10c 100644 --- a/presets/models/mistral/model.go +++ b/presets/models/mistral/model.go @@ -6,9 +6,9 @@ import ( "time" kaitov1alpha1 "github.com/kaito-project/kaito/api/v1alpha1" - "github.com/kaito-project/kaito/pkg/inference" "github.com/kaito-project/kaito/pkg/model" "github.com/kaito-project/kaito/pkg/utils/plugin" + "github.com/kaito-project/kaito/pkg/workspace/inference" ) func init() { diff --git a/presets/models/phi2/model.go b/presets/models/phi2/model.go index 0b038583b..31f495c7e 100644 --- a/presets/models/phi2/model.go +++ b/presets/models/phi2/model.go @@ -6,9 +6,9 @@ import ( "time" kaitov1alpha1 "github.com/kaito-project/kaito/api/v1alpha1" - "github.com/kaito-project/kaito/pkg/inference" "github.com/kaito-project/kaito/pkg/model" "github.com/kaito-project/kaito/pkg/utils/plugin" + "github.com/kaito-project/kaito/pkg/workspace/inference" ) func init() { diff --git a/presets/models/phi3/model.go b/presets/models/phi3/model.go index 1f15a827e..0cde3578c 100644 --- a/presets/models/phi3/model.go +++ b/presets/models/phi3/model.go @@ -6,9 +6,9 @@ import ( "time" kaitov1alpha1 "github.com/kaito-project/kaito/api/v1alpha1" - "github.com/kaito-project/kaito/pkg/inference" "github.com/kaito-project/kaito/pkg/model" "github.com/kaito-project/kaito/pkg/utils/plugin" + "github.com/kaito-project/kaito/pkg/workspace/inference" ) func init() {