factory-proxy改为factory-proxy-openai

factory-proxy改为factory-proxy-openai

Author: Xchat1

.github/workflows/ci.yml

@@ -46,7 +46,7 @@ jobs:
         name: codecov-umbrella
 
     - name: Build (Anthropic mode)
-      run: go build -v -o factory-proxy .
+      run: go build -v -o factory-proxy-openai .
 
     - name: Build (OpenAI mode)
       run: go build -v -tags openai -o factory-proxy-openai .
@@ -74,30 +74,30 @@ jobs:
     - name: Build binaries
       run: |
         # Linux AMD64
-        GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o factory-proxy-linux-amd64 .
+        GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o factory-proxy-openai-linux-amd64 .
         GOOS=linux GOARCH=amd64 go build -tags openai -ldflags="-s -w" -o factory-proxy-openai-linux-amd64 .
         
         # Linux ARM64
-        GOOS=linux GOARCH=arm64 go build -ldflags="-s -w" -o factory-proxy-linux-arm64 .
+        GOOS=linux GOARCH=arm64 go build -ldflags="-s -w" -o factory-proxy-openai-linux-arm64 .
         GOOS=linux GOARCH=arm64 go build -tags openai -ldflags="-s -w" -o factory-proxy-openai-linux-arm64 .
         
         # macOS AMD64
-        GOOS=darwin GOARCH=amd64 go build -ldflags="-s -w" -o factory-proxy-darwin-amd64 .
+        GOOS=darwin GOARCH=amd64 go build -ldflags="-s -w" -o factory-proxy-openai-darwin-amd64 .
         GOOS=darwin GOARCH=amd64 go build -tags openai -ldflags="-s -w" -o factory-proxy-openai-darwin-amd64 .
         
         # macOS ARM64
-        GOOS=darwin GOARCH=arm64 go build -ldflags="-s -w" -o factory-proxy-darwin-arm64 .
+        GOOS=darwin GOARCH=arm64 go build -ldflags="-s -w" -o factory-proxy-openai-darwin-arm64 .
         GOOS=darwin GOARCH=arm64 go build -tags openai -ldflags="-s -w" -o factory-proxy-openai-darwin-arm64 .
         
         # Windows AMD64
-        GOOS=windows GOARCH=amd64 go build -ldflags="-s -w" -o factory-proxy-windows-amd64.exe .
+        GOOS=windows GOARCH=amd64 go build -ldflags="-s -w" -o factory-proxy-openai-windows-amd64.exe .
         GOOS=windows GOARCH=amd64 go build -tags openai -ldflags="-s -w" -o factory-proxy-openai-windows-amd64.exe .
 
     - name: Create Release
       uses: softprops/action-gh-release@v1
       with:
         files: |
-          factory-proxy-*
+          factory-proxy-openai-*
         draft: false
         prerelease: false
       env:

.gitignore

@@ -1,5 +1,5 @@
 # Binaries
-factory-proxy
+factory-proxy-openai
 factory-proxy-openai
 *.exe
 *.exe~

CHANGELOG.md

@@ -19,7 +19,7 @@
 - **修复 Docker 构建失败** - 解决 `docker compose up -d` 时找不到 `main-openai.go` 文件的问题
   - 修正 [`Dockerfile`](Dockerfile:19) 复制文件路径，使用实际存在的 [`main_multimodel.go`](main_multimodel.go:1)
   - 添加必要的配置文件和目录复制：`config/`, `transformers/`, `config.json`, `docs.html`
-  - 统一两个运行阶段的二进制文件为 `factory-proxy`
+  - 统一两个运行阶段的二进制文件为 `factory-proxy-openai`
   - 更新 [`docker-compose.yml`](docker-compose.yml:1) 环境变量配置，使用 `FACTORY_API_KEY` 和 `PROXY_API_KEY`
 
 ### 📚 文档

Dockerfile

@@ -23,7 +23,7 @@ COPY config.json ./
 COPY docs.html ./
 
 # 构建应用
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o factory-proxy main_multimodel.go
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o factory-proxy-openai main_multimodel.go
 
 # 第二阶段：运行（Anthropic 原生模式）
 FROM alpine:latest AS anthropic
@@ -38,7 +38,7 @@ RUN addgroup -g 1000 app && \
 WORKDIR /app
 
 # 从构建阶段复制二进制文件和配置文件
-COPY --from=builder /build/factory-proxy .
+COPY --from=builder /build/factory-proxy-openai .
 COPY --from=builder /build/config.json .
 COPY --from=builder /build/docs.html .
 
@@ -56,7 +56,7 @@ HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
     CMD wget --no-verbose --tries=1 --spider http://localhost:8000/health || exit 1
 
 # 启动命令
-ENTRYPOINT ["./factory-proxy"]
+ENTRYPOINT ["./factory-proxy-openai"]
 
 # 第三阶段：运行（OpenAI 兼容模式）
 FROM alpine:latest AS openai
@@ -71,7 +71,7 @@ RUN addgroup -g 1000 app && \
 WORKDIR /app
 
 # 从构建阶段复制二进制文件和配置文件
-COPY --from=builder /build/factory-proxy .
+COPY --from=builder /build/factory-proxy-openai .
 COPY --from=builder /build/config.json .
 COPY --from=builder /build/docs.html .
 
@@ -89,4 +89,4 @@ HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
     CMD wget --no-verbose --tries=1 --spider http://localhost:8003/v1/health || exit 1
 
 # 启动命令
-ENTRYPOINT ["./factory-proxy"]
+ENTRYPOINT ["./factory-proxy-openai"]

Makefile

@@ -9,8 +9,8 @@ start: run-openai
 # 构建 Anthropic 原生模式
 build:
 	@echo "🔨 构建 Anthropic 原生模式..."
-	go build -ldflags="-s -w" -o factory-proxy main.go
-	@echo "✅ 构建完成: factory-proxy"
+	go build -ldflags="-s -w" -o factory-proxy-openai main.go
+	@echo "✅ 构建完成: factory-proxy-openai"
 
 # 构建 OpenAI 兼容模式
 build-openai:
@@ -28,7 +28,7 @@ install:
 # 运行 Anthropic 原生模式
 run: build
 	@echo "🚀 启动 Anthropic 原生模式..."
-	./factory-proxy
+	./factory-proxy-openai
 
 # 运行 OpenAI 兼容模式
 run-openai: build-openai
@@ -67,7 +67,7 @@ lint:
 # 清理构建文件
 clean:
 	@echo "🧹 清理构建文件..."
-	rm -f factory-proxy factory-proxy-openai
+	rm -f factory-proxy-openai factory-proxy-openai
 	rm -f *.log *.pid
 	rm -f coverage.txt
 	go clean -cache
@@ -78,19 +78,19 @@ build-all:
 	@echo "🔨 构建所有平台..."
 	@mkdir -p dist
 	# Linux AMD64
-	GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o dist/factory-proxy-linux-amd64 main.go
+	GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o dist/factory-proxy-openai-linux-amd64 main.go
 	GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o dist/factory-proxy-openai-linux-amd64 main-openai.go
 	# Linux ARM64
-	GOOS=linux GOARCH=arm64 go build -ldflags="-s -w" -o dist/factory-proxy-linux-arm64 main.go
+	GOOS=linux GOARCH=arm64 go build -ldflags="-s -w" -o dist/factory-proxy-openai-linux-arm64 main.go
 	GOOS=linux GOARCH=arm64 go build -ldflags="-s -w" -o dist/factory-proxy-openai-linux-arm64 main-openai.go
 	# macOS AMD64
-	GOOS=darwin GOARCH=amd64 go build -ldflags="-s -w" -o dist/factory-proxy-darwin-amd64 main.go
+	GOOS=darwin GOARCH=amd64 go build -ldflags="-s -w" -o dist/factory-proxy-openai-darwin-amd64 main.go
 	GOOS=darwin GOARCH=amd64 go build -ldflags="-s -w" -o dist/factory-proxy-openai-darwin-amd64 main-openai.go
 	# macOS ARM64
-	GOOS=darwin GOARCH=arm64 go build -ldflags="-s -w" -o dist/factory-proxy-darwin-arm64 main.go
+	GOOS=darwin GOARCH=arm64 go build -ldflags="-s -w" -o dist/factory-proxy-openai-darwin-arm64 main.go
 	GOOS=darwin GOARCH=arm64 go build -ldflags="-s -w" -o dist/factory-proxy-openai-darwin-arm64 main-openai.go
 	# Windows AMD64
-	GOOS=windows GOARCH=amd64 go build -ldflags="-s -w" -o dist/factory-proxy-windows-amd64.exe main.go
+	GOOS=windows GOARCH=amd64 go build -ldflags="-s -w" -o dist/factory-proxy-openai-windows-amd64.exe main.go
 	GOOS=windows GOARCH=amd64 go build -ldflags="-s -w" -o dist/factory-proxy-openai-windows-amd64.exe main-openai.go
 	@echo "✅ 所有平台构建完成，文件位于 dist/ 目录"
 

docker-compose.yml

@@ -2,11 +2,11 @@ version: '3.8'
 
 services:
   # Anthropic 原生模式
-  factory-proxy-anthropic:
+  factory-proxy-openai-anthropic:
     build:
       context: .
       target: anthropic
-    container_name: factory-proxy-anthropic
+    container_name: factory-proxy-openai-anthropic
     ports:
       - "8001:8000"
     environment:

docker-test-guide.md

@@ -0,0 +1,178 @@
+# Docker 部署测试指南
+
+## 当前状态
+❌ Docker Desktop 未找到或未安装
+
+## 安装步骤
+
+### 1. 安装 Docker Desktop for Mac
+
+请按照以下步骤安装 Docker Desktop：
+
+1. 访问 Docker 官网下载页面：
+   - Apple Silicon (M1/M2/M3): https://desktop.docker.com/mac/main/arm64/Docker.dmg
+   - Intel 芯片: https://desktop.docker.com/mac/main/amd64/Docker.dmg
+
+2. 下载后双击 `.dmg` 文件
+
+3. 将 Docker 图标拖到 Applications 文件夹
+
+4. 从 Applications 文件夹启动 Docker Desktop
+
+5. 首次启动需要授权并等待 Docker 引擎启动完成
+
+### 2. 验证 Docker 安装
+
+安装完成后，在终端运行：
+
+```bash
+# 检查 Docker 版本
+docker --version
+docker-compose --version
+
+# 检查 Docker 是否运行
+docker ps
+```
+
+## 测试计划
+
+安装完成后，将执行以下测试：
+
+### ✅ 已完成
+- [x] 检查 Docker 环境
+
+### 📋 待执行
+- [ ] 启动 Docker Desktop
+- [ ] 验证 Docker 环境
+- [ ] 测试 Docker 镜像构建（OpenAI 模式）
+- [ ] 测试 Docker Compose 启动服务
+- [ ] 验证服务健康状态
+- [ ] 测试 API 接口
+- [ ] 清理测试资源
+
+## 快速测试命令
+
+安装完成后，执行以下命令进行完整测试：
+
+### 方式1: 使用 Docker Compose (推荐)
+
+```bash
+# 构建并启动 OpenAI 兼容模式
+docker-compose up -d factory-proxy-openai
+
+# 查看服务状态
+docker-compose ps
+
+# 查看日志
+docker-compose logs -f factory-proxy-openai
+
+# 测试健康检查
+curl http://localhost:8003/v1/health
+
+# 测试 API 文档页面
+curl http://localhost:8003/
+
+# 停止服务
+docker-compose down
+```
+
+### 方式2: 使用纯 Docker 命令
+
+```bash
+# 构建镜像
+docker build --target openai -t factory-proxy-openai .
+
+# 运行容器
+docker run -d \
+  --name factory-proxy-openai \
+  -p 8003:8003 \
+  -e PORT=8003 \
+  factory-proxy-openai
+
+# 查看容器状态
+docker ps
+
+# 查看日志
+docker logs -f factory-proxy-openai
+
+# 测试健康检查
+curl http://localhost:8003/v1/health
+
+# 停止并删除容器
+docker stop factory-proxy-openai
+docker rm factory-proxy-openai
+
+# 删除镜像
+docker rmi factory-proxy-openai
+```
+
+## 测试 Anthropic 原生模式
+
+```bash
+# 使用 Docker Compose
+docker-compose up -d factory-proxy-openai-anthropic
+
+# 测试
+curl http://localhost:8001/health
+
+# 停止
+docker-compose down
+```
+
+## 同时测试两种模式
+
+```bash
+# 启动所有服务
+docker-compose up -d
+
+# 测试 OpenAI 模式
+curl http://localhost:8003/v1/health
+
+# 测试 Anthropic 模式
+curl http://localhost:8001/health
+
+# 查看所有容器
+docker-compose ps
+
+# 停止所有服务
+docker-compose down
+```
+
+## 常见问题
+
+### 1. Docker 命令未找到
+确保 Docker Desktop 已启动，可以在 macOS 顶部菜单栏看到 Docker 图标
+
+### 2. 端口被占用
+如果端口 8003 或 8001 被占用，可以修改 `docker-compose.yml` 中的端口映射：
+```yaml
+ports:
+  - "9003:8003"  # 将主机端口改为 9003
+```
+
+### 3. 构建失败
+检查网络连接，确保可以访问 Go 模块代理和 Docker Hub
+
+### 4. 容器启动失败
+查看容器日志：
+```bash
+docker logs factory-proxy-openai
+```
+
+## 性能测试
+
+部署成功后，可以进行性能测试：
+
+```bash
+# 使用 Apache Bench (需要安装)
+ab -n 100 -c 10 http://localhost:8003/v1/health
+
+# 或使用 curl 循环测试
+for i in {1..10}; do
+  curl -w "\nTime: %{time_total}s\n" http://localhost:8003/v1/health
+done
+```
+
+## 下一步
+
+请先安装 Docker Desktop，然后我可以继续帮您完成自动化测试。