Refactor

PySymGym · Jan 31, 2025 · 35432c6 · 35432c6
1 parent 46b9b42
commit 35432c6
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 28 deletions.
diff --git a/Test.Sockets/Main.fs b/Test.Sockets/Main.fs
@@ -0,0 +1,45 @@
+open System
+open System.Net
+open System.Net.Sockets
+open System.Text
+
+[<EntryPoint>]
+let main args =
+
+    // Параметры подключения (можно изменить при необходимости)
+    let host = "127.0.0.1"  // или "localhost"
+    let port = 35100
+
+    printfn "Подключение к %s:%i..." host port
+
+    // Создаем TCP-клиент и подключаемся к удалённому хосту
+    use client = new TcpClient()
+    client.Connect(host, port)
+
+    // Получаем сетевой поток для записи
+    use stream = client.GetStream()
+    printfn "Подключено. Введите строки для отправки (Ctrl+C для выхода)."
+
+    // Бесконечный цикл чтения строк с консоли и отправки их в сокет
+    let rec sendLoop () =
+        printf "> "
+        let line = Console.ReadLine()
+        match line with
+        | null | "" ->
+            // Если ввели пустую строку или EOF (null),
+            // при желании можно завершить работу или пропустить итерацию.
+            // В примере завершим отправку.
+            printfn "Завершение..."
+            ()
+        | text ->
+            // Преобразуем строку в байты и отправляем.
+            // Добавляем перевод строки.
+            let bytes = Encoding.UTF8.GetBytes(text + Environment.NewLine)
+            stream.Write(bytes, 0, bytes.Length)
+            stream.Flush()
+            // Переходим к следующему циклу
+            sendLoop()
+
+    sendLoop()
+
+    0 // код возврата из приложения
diff --git a/VSharp.Explorer/AISearcher.fs b/VSharp.Explorer/AISearcher.fs
@@ -2,10 +2,7 @@ namespace VSharp.Explorer
 
 open System.Collections.Generic
 open Microsoft.ML.OnnxRuntime
-open System.IO
 open System
-open System.Net
-open System.Net.Sockets
 open System.Text
 open System.Text.Json
 open VSharp
@@ -231,6 +228,7 @@ type internal AISearcher(oracle: Oracle, aiAgentTrainingMode: Option<AIAgentTrai
             let arrayOutputJson =
                 JsonSerializer.Serialize arrayOutput
             arrayOutputJson
+
         let stepToString (gameState: GameState) (output: IDisposableReadOnlyCollection<OrtValue>) =
             let gameStateJson =
                 JsonSerializer.Serialize gameState
@@ -246,22 +244,19 @@ type internal AISearcher(oracle: Oracle, aiAgentTrainingMode: Option<AIAgentTrai
             String.concat " " strToSaveAsList
 
         let createOracleRunner (pathToONNX: string, aiAgentTrainingModelOptions: Option<AIAgentTrainingModelOptions>) =
-            let host = "localhost"
-            let port =
+            let stream =
                 match aiAgentTrainingModelOptions with
-                | Some options -> options.port
-                | None -> 0
-
-            let client = new TcpClient ()
-            client.Connect (host, port)
-            client.SendBufferSize <- 2048
-            let stream = client.GetStream ()
+                | Some options -> options.stream
+                | None -> None
 
             let saveStep (gameState: GameState) (output: IDisposableReadOnlyCollection<OrtValue>) =
-                let bytes =
-                    Encoding.UTF8.GetBytes (stepToString gameState output)
-                stream.Write (bytes, 0, bytes.Length)
-                stream.Flush ()
+                match stream with
+                | Some stream ->
+                    let bytes =
+                        Encoding.UTF8.GetBytes (stepToString gameState output)
+                    stream.Write (bytes, 0, bytes.Length)
+                    stream.Flush ()
+                | None -> ()
 
             let sessionOptions =
                 if useGPU then

diff --git a/VSharp.Explorer/Options.fs b/VSharp.Explorer/Options.fs
@@ -3,6 +3,7 @@ namespace VSharp.Explorer
 open System.Diagnostics
 open System.IO
 open VSharp.ML.GameServer.Messages
+open System.Net.Sockets
 
 type searchMode =
     | DFSMode
@@ -78,7 +79,7 @@ type AIAgentTrainingModelOptions =
     {
         aiAgentTrainingOptions: AIAgentTrainingOptions
         outputDirectory: string
-        port: int
+        stream: Option<NetworkStream> // use it for sending steps
     }
 
 

diff --git a/VSharp.ML.GameServer.Runner/Main.fs b/VSharp.ML.GameServer.Runner/Main.fs
@@ -1,4 +1,5 @@
 open System.IO
+open System.Net.Sockets
 open System.Reflection
 open Argu
 open Microsoft.FSharp.Core
@@ -36,6 +37,9 @@ type Mode =
     | Generator = 1
     | SendModel = 2
 
+let TIMEOUT_FOR_TRAINING = 15 * 60
+let SOLVER_TIMEOUT_FOR_TRAINING = 2
+
 type CliArguments =
     | [<Unique>] Port of int
     | [<Unique>] DatasetBasePath of string
@@ -239,11 +243,11 @@ let ws port outputDirectory (webSocket: WebSocket) (context: HttpContext) =
 
                     let options =
                         VSharpOptions (
-                            timeout = 15 * 60,
+                            timeout = TIMEOUT_FOR_TRAINING,
                             outputDirectory = outputDirectory,
                             searchStrategy = SearchStrategy.AI,
                             aiOptions = (Some aiOptions |> Option.defaultValue Unchecked.defaultof<_>),
-                            solverTimeout = 2
+                            solverTimeout = SOLVER_TIMEOUT_FOR_TRAINING
                         )
 
                     let explorationResult =
@@ -278,6 +282,9 @@ let app port outputDirectory : WebPart =
             path "/gameServer" >=> handShake (ws port outputDirectory)
         ]
 
+let serializeExplorationResult (explorationResult: ExplorationResult) =
+    $"{explorationResult.ActualCoverage} {explorationResult.TestsCount} {explorationResult.StepsCount} {explorationResult.ErrorsCount}"
+
 let generateDataForPretraining outputDirectory datasetBasePath (maps: ResizeArray<GameMap>) stepsToSerialize =
     for map in maps do
         if map.StepsToStart = 0u<step> then
@@ -322,10 +329,7 @@ let generateDataForPretraining outputDirectory datasetBasePath (maps: ResizeArra
 
             let explorationResult = explore map options
 
-            File.WriteAllText (
-                Path.Join (folderForResults, "result"),
-                $"{explorationResult.ActualCoverage} {explorationResult.TestsCount} {explorationResult.StepsCount} {explorationResult.ErrorsCount}"
-            )
+            File.WriteAllText (Path.Join (folderForResults, "result"), serializeExplorationResult explorationResult)
 
             printfn
                 $"Generation for {map.MapName} finished with coverage {explorationResult.ActualCoverage}, tests {explorationResult.TestsCount}, steps {explorationResult.StepsCount},errors {explorationResult.ErrorsCount}."
@@ -334,7 +338,14 @@ let generateDataForPretraining outputDirectory datasetBasePath (maps: ResizeArra
             API.Reset ()
             HashMap.hashMap.Clear ()
 
-let runTrainingSendModelMode outputDirectory (gameMap: GameMap) (pathToModel: string) (useGPU: bool) (optimize: bool) (port: int) =
+let runTrainingSendModelMode
+    outputDirectory
+    (gameMap: GameMap)
+    (pathToModel: string)
+    (useGPU: bool)
+    (optimize: bool)
+    (port: int)
+    =
     printfn $"Run infer on {gameMap.MapName} have started."
 
     let aiTrainingOptions =
@@ -354,22 +365,29 @@ let runTrainingSendModelMode outputDirectory (gameMap: GameMap) (pathToModel: st
             oracle = None
         }
 
+    let stream =
+        let host = "localhost" // TODO: working within a local network
+        let client = new TcpClient ()
+        client.Connect (host, port)
+        client.SendBufferSize <- 2048
+        Some <| client.GetStream ()
+
     let aiOptions: AIOptions =
         Training (
             SendModel
                 {
                     aiAgentTrainingOptions = aiTrainingOptions
                     outputDirectory = outputDirectory
-                    port = port
+                    stream = stream
                 }
         )
 
     let options =
         VSharpOptions (
-            timeout = 15 * 60,
+            timeout = TIMEOUT_FOR_TRAINING,
             outputDirectory = outputDirectory,
             searchStrategy = SearchStrategy.AI,
-            solverTimeout = 2,
+            solverTimeout = SOLVER_TIMEOUT_FOR_TRAINING,
             aiOptions = (Some aiOptions |> Option.defaultValue Unchecked.defaultof<_>),
             pathToModel = pathToModel,
             useGPU = useGPU,
@@ -381,7 +399,7 @@ let runTrainingSendModelMode outputDirectory (gameMap: GameMap) (pathToModel: st
 
     File.WriteAllText (
         Path.Join (outputDirectory, gameMap.MapName + "result"),
-        $"{explorationResult.ActualCoverage} {explorationResult.TestsCount} {explorationResult.StepsCount} {explorationResult.ErrorsCount}"
+        serializeExplorationResult explorationResult
     )
 
     printfn