fix: Fixed issue with Serve/OpenAI

tryAGI · Dec 10, 2024 · 12de181 · 12de181
1 parent 7151734
commit 12de181
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 46 deletions.
diff --git a/src/Packaging.props b/src/Packaging.props
@@ -53,7 +53,7 @@
     </PropertyGroup>
 
     <PropertyGroup Label="Trimmable" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
-        <IsAotCompatible>true</IsAotCompatible>
+        <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
         <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
         <IsTrimmable>true</IsTrimmable>
         <SuppressTrimAnalysisWarnings>false</SuppressTrimAnalysisWarnings>

diff --git a/src/Serve/OpenAI/ServeController.cs b/src/Serve/OpenAI/ServeController.cs
@@ -1,43 +1,43 @@
-using System.Text.Json.Serialization;
-using OpenAI;
-
-namespace LangChain.Serve.OpenAI;
-
-public class ServeController(
-    ServeOptions options)
-{
-    public ModelsList GetModel()
-    {
-        return new ModelsList
-        {
-            Models = options.ListModels().Select(static x => new Model12
-            {
-                Object = ModelObject.Model,
-                Created = DateTimeOffset.UtcNow,
-                Id = x,
-                OwnedBy = "OpenAI",
-            }).ToList()
-        };
-    }
-
-    public ModelsList ListModels()
-    {
-        return new ModelsList
-        {
-            Models = options.ListModels().Select(static x => new Model12
-            {
-                Object = ModelObject.Model,
-                Created = DateTimeOffset.UtcNow,
-                Id = x,
-                OwnedBy = "OpenAI",
-            }).ToList()
-        };
-    }
-}
-
-public sealed class ModelsList
-{
-    [JsonInclude]
-    [JsonPropertyName("data")]
-    public IReadOnlyCollection<Model12> Models { get; set; } = [];
-}
+// using System.Text.Json.Serialization;
+// using OpenAI;
+//
+// namespace LangChain.Serve.OpenAI;
+//
+// public class ServeController(
+//     ServeOptions options)
+// {
+//     public ModelsList GetModel()
+//     {
+//         return new ModelsList
+//         {
+//             Models = options.ListModels().Select(static x => new Model12
+//             {
+//                 Object = ModelObject.Model,
+//                 Created = DateTimeOffset.UtcNow,
+//                 Id = x,
+//                 OwnedBy = "OpenAI",
+//             }).ToList()
+//         };
+//     }
+//
+//     public ModelsList ListModels()
+//     {
+//         return new ModelsList
+//         {
+//             Models = options.ListModels().Select(static x => new Model12
+//             {
+//                 Object = ModelObject.Model,
+//                 Created = DateTimeOffset.UtcNow,
+//                 Id = x,
+//                 OwnedBy = "OpenAI",
+//             }).ToList()
+//         };
+//     }
+// }
+//
+// public sealed class ModelsList
+// {
+//     [JsonInclude]
+//     [JsonPropertyName("data")]
+//     public IReadOnlyCollection<Model15> Models { get; set; } = [];
+// }
diff --git a/src/Serve/OpenAI/ServeExtensions.cs b/src/Serve/OpenAI/ServeExtensions.cs
@@ -26,9 +26,9 @@ public static WebApplication UseLangChainServeOpenAi(this WebApplication app, Ac
         options(serveMiddlewareOptions);
         // var repository = app.Services.GetRequiredService<IConversationRepository>();
         // var conversationNameProvider = app.Services.GetRequiredService<IConversationNameProvider>();
-        var controller = new ServeController(serveMiddlewareOptions);
+        //var controller = new ServeController(serveMiddlewareOptions);
 
-        app.MapGet("/v1/models", () => Results.Ok(controller.ListModels()));
+        //app.MapGet("/v1/models", () => Results.Ok(controller.ListModels()));
         app.MapPost("/v1/chat/completions", async (CreateChatCompletionRequest request) =>
         {
             var llm = serveMiddlewareOptions.GetModel(request.Model.Value1 ?? request.Model.Value2?.ToValueString() ?? string.Empty);