Skip to content

Commit 7a2d353

Browse files
committed
Merge branch 'main' of github.com:mosir/picoclaw into fix/atomic-file-writes
2 parents 11996f1 + 100356e commit 7a2d353

33 files changed

+274
-184
lines changed

.golangci.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ linters:
6666
- testifylint
6767
- thelper
6868
- unparam
69-
- unused
7069
- usestdlibvars
7170
- usetesting
7271
- wastedassign
@@ -152,6 +151,9 @@ linters:
152151
- gocognit
153152
- gocyclo
154153
path: _test\.go$
154+
- linters:
155+
- nolintlint
156+
path: 'pkg/tools/(i2c\.go|spi\.go)$'
155157

156158
issues:
157159
max-issues-per-linter: 0

Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ GO_VERSION=$(shell $(GO) version | awk '{print $$3}')
1414
LDFLAGS=-ldflags "-X main.version=$(VERSION) -X main.gitCommit=$(GIT_COMMIT) -X main.buildTime=$(BUILD_TIME) -X main.goVersion=$(GO_VERSION) -s -w"
1515

1616
# Go variables
17-
GO?=go
17+
GO?=CGO_ENABLED=0 go
1818
GOFLAGS?=-v -tags stdjson
1919

2020
# Golangci-lint
@@ -144,6 +144,10 @@ fmt:
144144
lint:
145145
@$(GOLANGCI_LINT) run
146146

147+
## fix: Fix linting issues
148+
fix:
149+
@$(GOLANGCI_LINT) run --fix
150+
147151
## deps: Download dependencies
148152
deps:
149153
@$(GO) mod download
@@ -169,7 +173,7 @@ help:
169173
@echo " make [target]"
170174
@echo ""
171175
@echo "Targets:"
172-
@grep -E '^## ' $(MAKEFILE_LIST) | sed 's/## / /'
176+
@grep -E '^## ' $(MAKEFILE_LIST) | sort | awk -F': ' '{printf " %-16s %s\n", substr($$1, 4), $$2}'
173177
@echo ""
174178
@echo "Examples:"
175179
@echo " make build # Build for current platform"

README.fr.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ picoclaw onboard
226226
],
227227
"agents": {
228228
"defaults": {
229-
"model": "gpt4"
229+
"model_name": "gpt4"
230230
}
231231
},
232232
"channels": {

README.ja.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ picoclaw onboard
188188
],
189189
"agents": {
190190
"defaults": {
191-
"model": "gpt4"
191+
"model_name": "gpt4"
192192
}
193193
},
194194
"channels": {

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
<br>
1313
<a href="https://picoclaw.io"><img src="https://img.shields.io/badge/Website-picoclaw.io-blue?style=flat&logo=google-chrome&logoColor=white" alt="Website"></a>
1414
<a href="https://x.com/SipeedIO"><img src="https://img.shields.io/badge/X_(Twitter)-SipeedIO-black?style=flat&logo=x&logoColor=white" alt="Twitter"></a>
15+
<br>
16+
<a href="./assets/wechat.png"><img src="https://img.shields.io/badge/WeChat-Group-41d56b?style=flat&logo=wechat&logoColor=white"></a>
17+
<a href="https://discord.gg/V4sAZ9XWpN"><img src="https://img.shields.io/badge/Discord-Community-4c60eb?style=flat&logo=discord&logoColor=white" alt="Discord"></a>
1518
</p>
1619

1720
[中文](README.zh.md) | [日本語](README.ja.md) | [Português](README.pt-br.md) | [Tiếng Việt](README.vi.md) | [Français](README.fr.md) | **English**
@@ -219,7 +222,7 @@ picoclaw onboard
219222
"agents": {
220223
"defaults": {
221224
"workspace": "~/.picoclaw/workspace",
222-
"model": "gpt4",
225+
"model_name": "gpt4",
223226
"max_tokens": 8192,
224227
"temperature": 0.7,
225228
"max_tool_iterations": 20

README.pt-br.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ picoclaw onboard
227227
],
228228
"agents": {
229229
"defaults": {
230-
"model": "gpt4"
230+
"model_name": "gpt4"
231231
}
232232
},
233233
"tools": {

README.vi.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ picoclaw onboard
207207
],
208208
"agents": {
209209
"defaults": {
210-
"model": "gpt4"
210+
"model_name": "gpt4"
211211
}
212212
},
213213
"channels": {

README.zh.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ picoclaw onboard
224224
"agents": {
225225
"defaults": {
226226
"workspace": "~/.picoclaw/workspace",
227-
"model": "gpt4",
227+
"model_name": "gpt4",
228228
"max_tokens": 8192,
229229
"temperature": 0.7,
230230
"max_tool_iterations": 20

assets/wechat.png

6.38 KB
Loading

cmd/picoclaw/cmd_agent.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func agentCmd() {
5656
}
5757

5858
if modelOverride != "" {
59-
cfg.Agents.Defaults.Model = modelOverride
59+
cfg.Agents.Defaults.ModelName = modelOverride
6060
}
6161

6262
provider, modelID, err := providers.CreateProvider(cfg)
@@ -66,7 +66,7 @@ func agentCmd() {
6666
}
6767
// Use the resolved model ID from provider creation
6868
if modelID != "" {
69-
cfg.Agents.Defaults.Model = modelID
69+
cfg.Agents.Defaults.ModelName = modelID
7070
}
7171

7272
msgBus := bus.NewMessageBus()

0 commit comments

Comments
 (0)