-
Notifications
You must be signed in to change notification settings - Fork 988
feat(model-service): add OpenAI-compatible wrapper (+ pm2 + env example) and update ignores #254
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
MCVelasquez45
wants to merge
2
commits into
mistralai:main
Choose a base branch
from
The-Second-Story-Initiative:dev
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+114
−0
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| OPENAI_BASE_URL=https://api.openai.com/v1 | ||
| OPENAI_API_KEY=sk-REPLACE_ME | ||
| MODEL_NAME=gpt-4o-mini | ||
| PORT=7071 | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| package-lock.json | ||
| node_modules/ | ||
| .env | ||
| .DS_Store | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| web: node server.js | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| module.exports = { | ||
| apps: [ | ||
| { | ||
| name: 'reentry-model-service', | ||
| script: 'server.js', | ||
| instances: 1, | ||
| exec_mode: 'fork', | ||
| env: { | ||
| // server.js loads dotenv; these are optional overrides | ||
| PORT: process.env.PORT || 7071, | ||
| }, | ||
| watch: false, | ||
| }, | ||
| ], | ||
| }; | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "name": "reentry-model-service", | ||
| "version": "1.0.0", | ||
| "private": true, | ||
| "main": "server.js", | ||
| "license": "UNLICENSED", | ||
| "scripts": { | ||
| "dev": "node server.js", | ||
| "start": "node server.js", | ||
| "pm2": "pm2 start ecosystem.config.js" | ||
| }, | ||
| "dependencies": { | ||
| "dotenv": "^16.4.5", | ||
| "express": "^4.19.2", | ||
| "node-fetch": "^2.7.0" | ||
| }, | ||
| "engines": { | ||
| "node": ">=18" | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| const express = require('express'); | ||
| const fetch = require('node-fetch'); | ||
| const dotenv = require('dotenv'); | ||
|
|
||
| dotenv.config(); | ||
|
|
||
| const app = express(); | ||
| app.use(express.json()); | ||
|
|
||
| const PORT = process.env.PORT || 7071; | ||
| const OPENAI_BASE_URL = (process.env.OPENAI_BASE_URL || 'https://api.openai.com/v1').replace(/\/+$/, ''); | ||
| const OPENAI_API_KEY = process.env.OPENAI_API_KEY || ''; | ||
| const MODEL_NAME = process.env.MODEL_NAME || 'gpt-4o-mini'; | ||
|
|
||
| // Health endpoint | ||
| app.get('/health', (_req, res) => { | ||
| res.json({ ok: true, model: MODEL_NAME, base: OPENAI_BASE_URL }); | ||
| }); | ||
|
|
||
| // Generate endpoint - forwards to provider-compatible chat/completions | ||
| app.post('/generate', async (req, res) => { | ||
| try { | ||
| if (!OPENAI_API_KEY) { | ||
| return res.status(400).json({ error: 'Missing OPENAI_API_KEY in environment' }); | ||
| } | ||
|
|
||
| const body = req.body || {}; | ||
| const messages = body.messages; | ||
| const model = body.model || MODEL_NAME; | ||
| const extra = body.extra || {}; // allow optional pass-through params | ||
|
|
||
| if (!Array.isArray(messages) || messages.length === 0) { | ||
| return res.status(400).json({ error: 'Body must include messages: [{ role, content }]' }); | ||
| } | ||
|
|
||
| const url = `${OPENAI_BASE_URL}/chat/completions`; | ||
|
|
||
| const providerResp = await fetch(url, { | ||
| method: 'POST', | ||
| headers: { | ||
| 'Authorization': `Bearer ${OPENAI_API_KEY}`, | ||
| 'Content-Type': 'application/json' | ||
| }, | ||
| body: JSON.stringify({ model, messages, ...extra }) | ||
| }); | ||
|
|
||
| const data = await providerResp.json(); | ||
|
|
||
| if (!providerResp.ok) { | ||
| // Pass through provider error | ||
| return res.status(providerResp.status).json({ error: data.error || data }); | ||
| } | ||
|
|
||
| const text = data?.choices?.[0]?.message?.content || ''; | ||
| return res.json({ text }); | ||
| } catch (err) { | ||
| return res.status(500).json({ error: 'Upstream error', detail: String(err && err.message || err) }); | ||
| } | ||
| }); | ||
|
|
||
| app.listen(PORT, () => { | ||
| console.log(`model-service listening on http://localhost:${PORT}`); | ||
| }); | ||
|
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like you're referencing the
.gitignorefile and mentioning the addition of the following lines:Explanation in context:
These lines tell Git to ignore the
.envfile located in themodel-servicedirectory. The.envfile typically contains environment variables, which often include sensitive information like API keys, database credentials, or other configuration details that should not be committed to source control.Code Review Feedback & Suggestions:
Duplication:
model-service/.env. Remove the duplicate to keep the.gitignoreclean.Security:
.envfiles. This helps prevent accidentally pushing sensitive data to the repository.Clarity:
.envfiles in multiple subdirectories, consider using a pattern like**/.env. However, if you only want to ignore it inmodel-service, your current approach is correct.Team Communication:
.envmeans everyone needs to create their own local version or use a sample file (like.env.example) to share the required variables.Suggested Correction:
Just keep one entry:
Summary:
Your intent is good for security and standard practice. Just remove the duplicate line for neatness. If you need further help with
.envhandling or best practices, let me know!