❇️ project structure change for release/1.0-rc1

yusufcanb · Feb 23, 2024 · 0b4a039 · 0b4a039
1 parent 9126657
commit 0b4a039
Show file tree

Hide file tree

Showing 29 changed files with 64 additions and 219 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -20,7 +20,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          go get ./...
+          go install github.com/yusufcanb/tlm
         env:
           GOPATH: /opt/hostedtoolcache/go
 

diff --git a/cmd/VERSION → VERSION b/cmd/VERSION → VERSION
diff --git a/app/Modelfile.explain b/app/Modelfile.explain
@@ -0,0 +1,8 @@
+FROM codellama:7b
+
+PARAMETER temperature 0.3
+PARAMETER top_p 0.5
+PARAMETER top_k 40
+PARAMETER seed 42
+
+SYSTEM You will be explaining given executable shell command to user with shortest possible explanation. If given input is not a shell command, you will respond with "I can only explain shell commands. Please provide a shell command to explain."
diff --git a/cmd/Modelfile.suggest → app/Modelfile.suggest b/cmd/Modelfile.suggest → app/Modelfile.suggest
diff --git a/pkg/app/app.go → app/app.go b/pkg/app/app.go → app/app.go
@@ -3,19 +3,28 @@ package app
 import (
 	_ "embed"
 	ollama "github.com/jmorganca/ollama/api"
-	"github.com/yusufcanb/tlama/pkg/config"
-	"github.com/yusufcanb/tlama/pkg/explain"
-	"github.com/yusufcanb/tlama/pkg/install"
-	"github.com/yusufcanb/tlama/pkg/suggest"
+	"github.com/yusufcanb/tlm/config"
+	"github.com/yusufcanb/tlm/explain"
+	"github.com/yusufcanb/tlm/install"
+	"github.com/yusufcanb/tlm/suggest"
 
 	"github.com/urfave/cli/v2"
 )
 
+//go:embed Modelfile.explain
+var explainModelfile string
+
+//go:embed Modelfile.suggest
+var suggestModelfile string
+
 type TlmApp struct {
 	App *cli.App
+
+	explainModelfile string
+	suggestModelfile string
 }
 
-func New(version string, suggestModelfile string, explainModelfile string) *TlmApp {
+func New(version string) *TlmApp {
 	con := config.New()
 	con.LoadOrCreateConfig()
 

diff --git a/cmd/Modelfile.explain b/cmd/Modelfile.explain
diff --git a/cmd/cli.go b/cmd/cli.go
diff --git a/pkg/config/api.go → config/api.go b/pkg/config/api.go → config/api.go
@@ -3,7 +3,7 @@ package config
 import (
 	"fmt"
 	"github.com/spf13/viper"
-	"github.com/yusufcanb/tlama/pkg/shell"
+	"github.com/yusufcanb/tlm/shell"
 	"log"
 	"os"
 	"path"

diff --git a/pkg/config/cli.go → config/cli.go b/pkg/config/cli.go → config/cli.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"github.com/spf13/viper"
 	"github.com/urfave/cli/v2"
-	"github.com/yusufcanb/tlama/pkg/shell"
+	"github.com/yusufcanb/tlm/shell"
 )
 
 func (c *Config) Action(_ *cli.Context) error {

diff --git a/pkg/config/config.go → config/config.go b/pkg/config/config.go → config/config.go
diff --git a/pkg/config/form.go → config/form.go b/pkg/config/form.go → config/form.go
diff --git a/pkg/explain/api.go → explain/api.go b/pkg/explain/api.go → explain/api.go
diff --git a/pkg/explain/cli.go → explain/cli.go b/pkg/explain/cli.go → explain/cli.go
diff --git a/explain/explain.go b/explain/explain.go
@@ -0,0 +1,15 @@
+package explain
+
+import (
+	ollama "github.com/jmorganca/ollama/api"
+)
+
+type Explain struct {
+	api       *ollama.Client
+	modelfile string
+}
+
+func New(api *ollama.Client, modelfile string) *Explain {
+	e := &Explain{api: api, modelfile: modelfile}
+	return e
+}
diff --git a/go.mod b/go.mod
@@ -1,13 +1,11 @@
-module github.com/yusufcanb/tlama
+module github.com/yusufcanb/tlm
 
 go 1.21
 
 require (
-	github.com/briandowns/spinner v1.23.0
-	github.com/charmbracelet/bubbles v0.18.0
-	github.com/charmbracelet/bubbletea v0.25.0
 	github.com/charmbracelet/huh v0.3.0
 	github.com/charmbracelet/huh/spinner v0.0.0-20240209193029-45947515c4cf
+	github.com/charmbracelet/lipgloss v0.9.1
 	github.com/jmorganca/ollama v0.1.25
 	github.com/spf13/viper v1.18.2
 	github.com/urfave/cli/v2 v2.27.1
@@ -17,17 +15,15 @@ require (
 	github.com/atotto/clipboard v0.1.4 // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/catppuccin/go v0.2.0 // indirect
-	github.com/charmbracelet/harmonica v0.2.0 // indirect
-	github.com/charmbracelet/lipgloss v0.9.1 // indirect
+	github.com/charmbracelet/bubbles v0.18.0 // indirect
+	github.com/charmbracelet/bubbletea v0.25.0 // indirect
 	github.com/containerd/console v1.0.4 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
-	github.com/fatih/color v1.14.1 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-localereader v0.0.1 // indirect
 	github.com/mattn/go-runewidth v0.0.15 // indirect

diff --git a/go.sum b/go.sum
@@ -2,16 +2,12 @@ github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z
 github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
-github.com/briandowns/spinner v1.23.0 h1:alDF2guRWqa/FOZZYWjlMIx2L6H0wyewPxo/CH4Pt2A=
-github.com/briandowns/spinner v1.23.0/go.mod h1:rPG4gmXeN3wQV/TsAY4w8lPdIM6RX3yqeBQJSrbXjuE=
 github.com/catppuccin/go v0.2.0 h1:ktBeIrIP42b/8FGiScP9sgrWOss3lw0Z5SktRoithGA=
 github.com/catppuccin/go v0.2.0/go.mod h1:8IHJuMGaUUjQM82qBrGNBv7LFq6JI3NnQCF6MOlZjpc=
 github.com/charmbracelet/bubbles v0.18.0 h1:PYv1A036luoBGroX6VWjQIE9Syf2Wby2oOl/39KLfy0=
 github.com/charmbracelet/bubbles v0.18.0/go.mod h1:08qhZhtIwzgrtBjAcJnij1t1H0ZRjwHyGsy6AL11PSw=
 github.com/charmbracelet/bubbletea v0.25.0 h1:bAfwk7jRz7FKFl9RzlIULPkStffg5k6pNt5dywy4TcM=
 github.com/charmbracelet/bubbletea v0.25.0/go.mod h1:EN3QDR1T5ZdWmdfDzYcqOCAps45+QIJbLOBxmVNWNNg=
-github.com/charmbracelet/harmonica v0.2.0 h1:8NxJWRWg/bzKqqEaaeFNipOu77YR5t8aSwG4pgaUBiQ=
-github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=
 github.com/charmbracelet/huh v0.3.0 h1:CxPplWkgW2yUTDDG0Z4S5HH8SJOosWHd4LxCvi0XsKE=
 github.com/charmbracelet/huh v0.3.0/go.mod h1:fujUdKX8tC45CCSaRQdw789O6uaCRwx8l2NDyKfC4jA=
 github.com/charmbracelet/huh/spinner v0.0.0-20240209193029-45947515c4cf h1:hzfl5rHblaVR/8zfAoCBuqsTcEp/Zvy1IVZBIebZelM=
@@ -26,8 +22,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
-github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
@@ -49,9 +43,6 @@ github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
 github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
@@ -120,7 +111,6 @@ golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjs
 golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
 golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
 golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=

diff --git a/pkg/install/api.go → install/api.go b/pkg/install/api.go → install/api.go
diff --git a/pkg/install/cli.go → install/cli.go b/pkg/install/cli.go → install/cli.go
diff --git a/pkg/install/form.go → install/form.go b/pkg/install/form.go → install/form.go
diff --git a/pkg/install/install.go → install/install.go b/pkg/install/install.go → install/install.go
@@ -1,7 +1,6 @@
 package install
 
 import (
-	_ "embed"
 	ollama "github.com/jmorganca/ollama/api"
 )
 

diff --git a/main.go b/main.go
@@ -0,0 +1,19 @@
+package main
+
+import (
+	_ "embed"
+	"log"
+	"os"
+
+	"github.com/yusufcanb/tlm/app"
+)
+
+//go:embed VERSION
+var version string
+
+func main() {
+	tlm := app.New(version)
+	if err := tlm.App.Run(os.Args); err != nil {
+		log.Fatal(err)
+	}
+}
diff --git a/pkg/explain/explain.go b/pkg/explain/explain.go
diff --git a/pkg/suggest/views/prompt_view.go b/pkg/suggest/views/prompt_view.go
diff --git a/pkg/suggest/views/request_view.go b/pkg/suggest/views/request_view.go
diff --git a/pkg/shell/shell.go → shell/shell.go b/pkg/shell/shell.go → shell/shell.go
diff --git a/pkg/suggest/api.go → suggest/api.go b/pkg/suggest/api.go → suggest/api.go