symmetry as provider (#456)

* initail commit

* works

* better

* wdaf

* symmetry as provider

* 3.22.20

Author: rjmacarthy

package-lock.json

@@ -2,7 +2,7 @@
   "name": "twinny",
   "displayName": "twinny - AI Code Completion and Chat",
   "description": "Locally hosted AI code completion plugin for vscode",
-  "version": "3.22.19",
+  "version": "3.22.20",
   "icon": "assets/icon.png",
   "keywords": [
     "code-inference",
@@ -89,18 +89,13 @@
         {
           "command": "twinny.openChat",
           "group": "navigation@0",
-          "when": "view == twinny.sidebar && twinnyManageTemplates || view == twinny.sidebar && twinnyManageProviders || view == twinny.sidebar && twinnyConversationHistory || view == twinny.sidebar && twinnySymmetryTab || view == twinny.sidebar && twinnyReviewTab || view == twinny.sidebar && twinnyEmbeddingsTab"
+          "when": "view == twinny.sidebar && twinnyManageTemplates || view == twinny.sidebar && twinnyManageProviders || view == twinny.sidebar && twinnyConversationHistory || view == twinny.sidebar && twinnyReviewTab || view == twinny.sidebar && twinnyEmbeddingsTab"
         },
         {
           "command": "twinny.review",
           "group": "navigation@1",
           "when": "view == twinny.sidebar"
         },
-        {
-          "command": "twinny.symmetry",
-          "group": "navigation@2",
-          "when": "view == twinny.sidebar"
-        },
         {
           "command": "twinny.manageProviders",
           "group": "navigation@3",
@@ -191,12 +186,6 @@
         "title": "Code reviewer",
         "icon": "$(git-pull-request)"
       },
-      {
-        "command": "twinny.symmetry",
-        "shortTitle": "twinny symmetry network",
-        "title": "Symmetry network settings",
-        "icon": "$(mirror-public)"
-      },
       {
         "command": "twinny.conversationHistory",
         "shortTitle": "twinny conversation history",
@@ -536,7 +525,7 @@
     "rehype-raw": "^7.0.0",
     "remark-gfm": "^4.0.0",
     "string_score": "^0.1.22",
-    "symmetry-core": "^1.0.42",
+    "symmetry-core": "^1.0.43",
     "tippy.js": "^6.3.7",
     "tiptap-markdown": "^0.8.10",
     "toxe": "^1.1.0",

package.json

@@ -131,6 +131,7 @@ export const OPEN_AI_COMPATIBLE_PROVIDERS = {
   Oobabooga: "oobabooga",
   OpenWebUI: "openwebui",
   Ollama: "ollama",
+  Twinny: "twinny",
   OpenAICompatible: "openai-compatible"
 }
 

src/common/constants.ts

@@ -1,4 +1,5 @@
 import { ChatCompletionMessageParam } from "fluency.js"
+import { CompletionStreaming, LLMProvider } from "fluency.js/dist/chat"
 import { serverMessageKeys } from "symmetry-core"
 import { InlineCompletionItem, InlineCompletionList, Uri } from "vscode"
 
@@ -109,7 +110,10 @@ export interface GithubPullRequestMessage {
 
 export type ChatCompletionMessage = ChatCompletionMessageParam & {
   id?: string
-  excludeFromApi?: boolean
+}
+
+export type CompletionStreamingWithId = CompletionStreaming<LLMProvider> & {
+  id?: string
 }
 
 export interface Conversation {

src/common/types.ts

@@ -38,6 +38,7 @@ import { logger } from "../common/logger"
 import { models } from "../common/models"
 import {
   ChatCompletionMessage,
+  CompletionStreamingWithId,
   ContextFile,
   FileContextItem,
   ServerMessage,
@@ -353,7 +354,7 @@ export class Chat extends Base {
     }
   }
 
-  private async llmStream(requestBody: CompletionStreaming<LLMProvider>) {
+  private async llmStream(requestBody: CompletionStreamingWithId) {
     this._controller = new AbortController()
 
     this._lastStreamingRequest = requestBody
@@ -555,12 +556,14 @@ export class Chat extends Base {
 
   private async buildConversation(
     messages: ChatCompletionMessage[],
-    fileContexts: FileContextItem[] | undefined
+    fileContexts: FileContextItem[] | undefined,
+    id?: string // Add parameter for conversation ID
   ): Promise<ChatCompletionMessage[]> {
 
     const systemMessage: ChatCompletionMessage = {
       role: SYSTEM,
-      content: await this.getSystemPrompt()
+      content: await this.getSystemPrompt(),
+      id // Add conversation ID to system message
     }
 
     const lastMessage = messages[messages.length - 1]
@@ -576,16 +579,24 @@ export class Chat extends Base {
 
     conversation.push({
       role: USER,
-      content: `${lastMessage.content}\n\n${additionalContext.trim()}`.trim() || " "
+      content: `${lastMessage.content}\n\n${additionalContext.trim()}`.trim() || " ",
+      id // Add conversation ID to user message
     })
 
     return conversation.map((message) => {
       const stringContent = message.content as string
 
-      if ([SYSTEM, ASSISTANT].includes(message.role)) return message
+      if ([SYSTEM, ASSISTANT].includes(message.role)) {
+        // Preserve the conversationId if it exists
+        return {
+          ...message,
+          conversationId: id || message.id
+        }
+      }
 
       return {
         ...message,
+        conversationId: id || message.id, // Preserve the conversationId
         content: stringContent.replace(/&lt;/g, "<")
         .replace(/@problems/g, "").trim()
         .replace(/@workspace/g, "").trim()
@@ -606,12 +617,14 @@ export class Chat extends Base {
   }
 
   private getStreamOptions(
-    provider: TwinnyProvider
-  ): CompletionStreaming<LLMProvider> {
+    provider: TwinnyProvider,
+    conversationId?: string
+  ): CompletionStreamingWithId {
     return {
       messages: this._conversation,
       model: provider.modelName,
       stream: true,
+      id: conversationId,
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       provider: this.getProviderType(provider) as any
     }
@@ -692,12 +705,15 @@ export class Chat extends Base {
 
   public async completion(
     messages: ChatCompletionMessage[],
-    fileContexts?: FileContextItem[]
+    fileContexts?: FileContextItem[],
+    conversationId?: string // Add parameter for conversation ID
   ) {
     this._completion = ""
     this._isCancelled = false
     this.sendEditorLanguage()
 
+    // Debug log to track the conversation ID being received
+    console.log("Received completion request with conversation ID:", conversationId)
 
     const provider = this.getProvider()
 
@@ -708,12 +724,13 @@ export class Chat extends Base {
     this._conversation = await this.buildConversation(
       messages,
       fileContexts,
+      conversationId // Pass the conversation ID to buildConversation
     )
 
     const stream = this.shouldUseStreaming(provider)
 
     return stream
-      ? this.llmStream(this.getStreamOptions(provider))
+      ? this.llmStream(this.getStreamOptions(provider, conversationId))
       : this.llmNoStream(this.getNoStreamOptions(provider))
   }
 

src/extension/chat.ts

@@ -1,5 +1,4 @@
 import { ChatCompletionMessageParam } from "fluency.js"
-import { v4 as uuidv4 } from "uuid"
 import { ExtensionContext, Webview } from "vscode"
 
 import {
@@ -12,27 +11,18 @@ import { ClientMessage, Conversation, ServerMessage } from "../common/types"
 
 import { Base } from "./base"
 import { TwinnyProvider } from "./provider-manager"
-import { SessionManager } from "./session-manager"
-import { SymmetryService } from "./symmetry-service"
 
 type Conversations = Record<string, Conversation> | undefined
 
 export class ConversationHistory extends Base {
   public webView: Webview
-  private _sessionManager: SessionManager | undefined
-  private _symmetryService: SymmetryService
-  private _title = ""
 
   constructor(
     context: ExtensionContext,
     webView: Webview,
-    sessionManager: SessionManager | undefined,
-    symmetryService: SymmetryService
   ) {
     super(context)
     this.webView = webView
-    this._sessionManager = sessionManager
-    this._symmetryService = symmetryService
     this.setUpEventListeners()
   }
 
@@ -85,13 +75,11 @@ export class ConversationHistory extends Base {
     }
   }
 
-  async getConversationTitle(
+  getConversationTitle(
     messages: ChatCompletionMessageParam[]
-  ): Promise<string | null> {
-
+  ):string | undefined {
     const message = messages[0].content as string
-
-    return Promise.resolve(`${message?.substring(0, 50)}...`)
+    return `${message?.substring(0, 50)}...`
   }
 
   getAllConversations() {
@@ -115,12 +103,15 @@ export class ConversationHistory extends Base {
   }
 
   updateConversation(conversation: Conversation) {
-    const conversations = this.getConversations() || {}
     if (!conversation.id) return
+
+    const conversations = this.getConversations() || {}
+
     this.context?.globalState.update(CONVERSATION_STORAGE_KEY, {
       ...conversations,
       [conversation.id]: conversation
     })
+
     this.setActiveConversation(conversation)
   }
 
@@ -129,16 +120,19 @@ export class ConversationHistory extends Base {
       ACTIVE_CONVERSATION_STORAGE_KEY,
       conversation
     )
+
     this.webView?.postMessage({
       type: CONVERSATION_EVENT_NAME.setActiveConversation,
       data: conversation
     } as ServerMessage<Conversation>)
+
     this.getAllConversations()
   }
 
   getActiveConversation() {
     const conversation: Conversation | undefined =
       this.context?.globalState.get(ACTIVE_CONVERSATION_STORAGE_KEY)
+
     this.setActiveConversation(conversation)
     return conversation
   }
@@ -161,31 +155,13 @@ export class ConversationHistory extends Base {
 
   async saveConversation(conversation: Conversation) {
     const activeConversation = this.getActiveConversation()
-    if (activeConversation)
+
+    if (activeConversation) {
       return this.updateConversation({
         ...activeConversation,
-        messages: conversation.messages
+        messages: conversation.messages,
+        title: this.getConversationTitle(conversation.messages)
       })
-
-    if (!conversation.messages.length || conversation.messages.length > 2)
-      return
-
-    this._title = await this.getConversationTitle(conversation.messages) || " "
-    this.saveConversationEnd(conversation)
-  }
-
-  private saveConversationEnd(conversation: Conversation) {
-    const id = uuidv4()
-    const conversations = this.getConversations()
-    if (!conversations) return
-    const newConversation: Conversation = {
-      id,
-      title: this._title || "",
-      messages: conversation.messages
     }
-    conversations[id] = newConversation
-    this.context?.globalState.update(CONVERSATION_STORAGE_KEY, conversations)
-    this.setActiveConversation(newConversation)
-    this._title = ""
   }
 }

src/extension/conversation-history.ts

@@ -93,14 +93,13 @@ export class ProviderManager {
 
   getDefaultChatProvider() {
     return {
-      apiHostname: "0.0.0.0",
+      apiHostname: "twinny.dev",
       apiPath: "/v1",
-      apiPort: 11434,
-      apiProtocol: "http",
-      id: uuidv4(),
-      label: "OpenAI Compatible (localhost)",
-      modelName: "codellama:7b-instruct",
-      provider: API_PROVIDERS.Ollama,
+      apiProtocol: "https",
+      id: "symmetry-default",
+      label: "Twinny.dev (Symmetry)",
+      modelName: "llama3.2:latest",
+      provider: API_PROVIDERS.Twinny,
       type: "chat",
     } as TwinnyProvider
   }

src/extension/provider-manager.ts

@@ -102,8 +102,6 @@ export class BaseProvider {
     this.conversationHistory = new ConversationHistory(
       this.context,
       this.webView,
-      this._sessionManager,
-      this._symmetryService
     )
 
     this.reviewService = new ReviewService(
@@ -422,7 +420,11 @@ export class BaseProvider {
       )
     }
 
-    this.chat?.completion(data.data || [], data.meta as FileContextItem[])
+    this.chat?.completion(
+      data.data || [],
+      data.meta as FileContextItem[],
+      data.key // Pass the conversation ID
+    )
   }
 
   private getSelectedText = () => {