mirror of
https://github.com/lordmathis/llamactl.git
synced 2025-11-06 00:54:23 +00:00
Remove PythonPath references from MlxServerOptions and related configurations
This commit is contained in:
@@ -11,7 +11,6 @@ type MlxServerOptions struct {
|
|||||||
Model string `json:"model,omitempty"`
|
Model string `json:"model,omitempty"`
|
||||||
Host string `json:"host,omitempty"`
|
Host string `json:"host,omitempty"`
|
||||||
Port int `json:"port,omitempty"`
|
Port int `json:"port,omitempty"`
|
||||||
PythonPath string `json:"python_path,omitempty"` // Custom: Python venv path
|
|
||||||
|
|
||||||
// Model and adapter options
|
// Model and adapter options
|
||||||
AdapterPath string `json:"adapter_path,omitempty"`
|
AdapterPath string `json:"adapter_path,omitempty"`
|
||||||
@@ -59,7 +58,7 @@ func (o *MlxServerOptions) UnmarshalJSON(data []byte) error {
|
|||||||
"m": "model",
|
"m": "model",
|
||||||
"host": "host",
|
"host": "host",
|
||||||
"port": "port",
|
"port": "port",
|
||||||
"python_path": "python_path",
|
// "python_path": "python_path", // removed
|
||||||
|
|
||||||
// Model and adapter options
|
// Model and adapter options
|
||||||
"adapter-path": "adapter_path",
|
"adapter-path": "adapter_path",
|
||||||
@@ -145,9 +144,7 @@ func NewMlxServerOptions() *MlxServerOptions {
|
|||||||
// BuildCommandArgs converts to command line arguments
|
// BuildCommandArgs converts to command line arguments
|
||||||
func (o *MlxServerOptions) BuildCommandArgs() []string {
|
func (o *MlxServerOptions) BuildCommandArgs() []string {
|
||||||
var args []string
|
var args []string
|
||||||
|
|
||||||
// Note: PythonPath is handled in lifecycle.go execution logic
|
|
||||||
|
|
||||||
// Required and basic options
|
// Required and basic options
|
||||||
if o.Model != "" {
|
if o.Model != "" {
|
||||||
args = append(args, "--model", o.Model)
|
args = append(args, "--model", o.Model)
|
||||||
|
|||||||
@@ -71,9 +71,6 @@ type InstancesConfig struct {
|
|||||||
// Enable LRU eviction for instance logs
|
// Enable LRU eviction for instance logs
|
||||||
EnableLRUEviction bool `yaml:"enable_lru_eviction"`
|
EnableLRUEviction bool `yaml:"enable_lru_eviction"`
|
||||||
|
|
||||||
// Path to llama-server executable
|
|
||||||
LlamaExecutable string `yaml:"llama_executable"`
|
|
||||||
|
|
||||||
// Default auto-restart setting for new instances
|
// Default auto-restart setting for new instances
|
||||||
DefaultAutoRestart bool `yaml:"default_auto_restart"`
|
DefaultAutoRestart bool `yaml:"default_auto_restart"`
|
||||||
|
|
||||||
@@ -135,7 +132,6 @@ func LoadConfig(configPath string) (AppConfig, error) {
|
|||||||
MaxInstances: -1, // -1 means unlimited
|
MaxInstances: -1, // -1 means unlimited
|
||||||
MaxRunningInstances: -1, // -1 means unlimited
|
MaxRunningInstances: -1, // -1 means unlimited
|
||||||
EnableLRUEviction: true,
|
EnableLRUEviction: true,
|
||||||
LlamaExecutable: "llama-server",
|
|
||||||
DefaultAutoRestart: true,
|
DefaultAutoRestart: true,
|
||||||
DefaultMaxRestarts: 3,
|
DefaultMaxRestarts: 3,
|
||||||
DefaultRestartDelay: 5,
|
DefaultRestartDelay: 5,
|
||||||
|
|||||||
@@ -90,11 +90,6 @@ const basicMlxFieldsConfig: Record<string, {
|
|||||||
description: 'The path to the MLX model weights, tokenizer, and config',
|
description: 'The path to the MLX model weights, tokenizer, and config',
|
||||||
required: true
|
required: true
|
||||||
},
|
},
|
||||||
python_path: {
|
|
||||||
label: 'Python Virtual Environment Path',
|
|
||||||
placeholder: '/path/to/venv',
|
|
||||||
description: 'Path to Python virtual environment (optional)'
|
|
||||||
},
|
|
||||||
temp: {
|
temp: {
|
||||||
label: 'Temperature',
|
label: 'Temperature',
|
||||||
placeholder: '0.0',
|
placeholder: '0.0',
|
||||||
|
|||||||
@@ -176,7 +176,6 @@ export const MlxBackendOptionsSchema = z.object({
|
|||||||
model: z.string().optional(),
|
model: z.string().optional(),
|
||||||
host: z.string().optional(),
|
host: z.string().optional(),
|
||||||
port: z.number().optional(),
|
port: z.number().optional(),
|
||||||
python_path: z.string().optional(),
|
|
||||||
|
|
||||||
// Model and adapter options
|
// Model and adapter options
|
||||||
adapter_path: z.string().optional(),
|
adapter_path: z.string().optional(),
|
||||||
|
|||||||
Reference in New Issue
Block a user