matt/ollama37
1
0
Fork 0
mirror of https://github.com/dogkeeper886/ollama37.git synced 2025-12-10 15:57:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

pass flags to serve to allow setting allowed-origins + host and port

Browse Source 
* resolves: https://github.com/jmorganca/ollama/issues/300 and
https://github.com/jmorganca/ollama/issues/282

* example usage:
```
ollama serve --port 9999 --allowed-origins "http://foo.example.com,http://192.0.0.1"
```
This commit is contained in:
cmiller01
2023-08-07 03:34:37 +00:00
parent 06fc48ad66
commit fb593b7bfc
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
cmd/cmd.go
View File

@@ -513,23 +513,33 @@ func generateBatch(cmd *cobra.Command, model string) error {
return nil
}
func RunServer(_ *cobra.Command, _ []string) error {
host := os.Getenv("OLLAMA_HOST")
if host == "" {
host = "127.0.0.1"
func RunServer(cmd *cobra.Command, _ []string) error {
host, err := cmd.Flags().GetString("host")
if err != nil {
return errors.New("host unset")
}
if os.Getenv("OLLAMA_HOST") != "" {
host = os.Getenv("OLLAMA_HOST")
}
port, err := cmd.Flags().GetString("port")
if err != nil {
return errors.New("port unset")
}
port := os.Getenv("OLLAMA_PORT")
if port == "" {
port = "11434"
if os.Getenv("OLLAMA_PORT") != "" {
port = os.Getenv("OLLAMA_PORT")
}
ln, err := net.Listen("tcp", fmt.Sprintf("%s:%s", host, port))
if err != nil {
return err
}
extraOrigins, err := cmd.Flags().GetStringSlice("allowed-origins")
if err != nil {
return err
}
return server.Serve(ln)
return server.Serve(ln, extraOrigins)
}
func startMacApp(client *api.Client) error {
@@ -621,6 +631,10 @@ func NewCLI() *cobra.Command {
RunE: RunServer,
}
serveCmd.Flags().String("port", "11434", "Port to listen on, may also use OLLAMA_PORT environment variable")
serveCmd.Flags().String("host", "127.0.0.1", "Host listen address, may also use OLLAMA_HOST environment variable")
serveCmd.Flags().StringSlice("allowed-origins", []string{}, "Additional allowed CORS origins (outside of localhost), specify as comma-separated list")
pullCmd := &cobra.Command{
Use: "pull MODEL",
Short: "Pull a model from a registry",