From fce421fb335107cddd9fd60b32e91902be7b5eae Mon Sep 17 00:00:00 2001
From: Silen Naihin <silen.naihin@gmail.com>
Date: Thu, 29 Jun 2023 20:51:23 -0400
Subject: [PATCH] moving logic to benchmark.py file

---
 agbenchmark/benchmark.py | 65 ++++++++++++++++++++++++++++++++++++++++
 agbenchmark/conftest.py  | 61 ++-----------------------------------
 2 files changed, 67 insertions(+), 59 deletions(-)
 create mode 100644 agbenchmark/benchmark.py

diff --git a/agbenchmark/benchmark.py b/agbenchmark/benchmark.py
new file mode 100644
index 00000000..6dc3b231
--- /dev/null
+++ b/agbenchmark/benchmark.py
@@ -0,0 +1,65 @@
+import os
+import sys
+import pexpect as expect
+from dotenv import load_dotenv
+
+load_dotenv()
+
+
+def check_cycle_count(cycle_count: int, cutoff: int, proc):
+    """Increment, print, and check cycle count."""
+    cycle_count += 1
+    print(f"Cycle count: {cycle_count}")
+    if cycle_count >= cutoff:
+        proc.terminate(force=True)
+    return cycle_count
+
+
+AGENT_NAME = os.getenv("AGENT_NAME")
+
+
+def run_agnostic(config, task):
+    path = os.path.join(os.getcwd(), f"agent\\{AGENT_NAME}")
+
+    timeout = sys.maxsize
+
+    if config["cutoff"]["type"] == "time":
+        timeout = config["cutoff"]["count"] or 60
+
+    # from pexpect.popen_spawn import PopenSpawn
+
+    print(f"Running {task} with timeout {timeout}")
+
+    # Starting the subprocess using pexpect
+    proc = expect.spawn("python", ["miniagi.py", task], timeout=timeout, cwd=path)
+
+    print("proc", proc)
+
+    cycle_count = 0
+
+    while True:
+        try:
+            # If we get the prompt for user input, we send "\n"
+            if config["cutoff"]["type"] == "user_input":
+                proc.expect([config["cutoff"]["user_prompt"]])
+                proc.sendline(config["cutoff"]["user_input"])
+                cycle_count = check_cycle_count(
+                    cycle_count, config["cutoff"]["count"], proc
+                )
+            elif config["cutoff"]["type"] == "cycle_count":
+                match = proc.expect([r"Cycle count: (\d+)"])
+                if match is not None:
+                    cycle_count = int(match.group(1))  # type: ignore
+                    cycle_count = check_cycle_count(
+                        cycle_count, config["cutoff"]["count"], proc
+                    )
+
+            # for cutoff type "time", just let it run until timeout
+        except expect.TIMEOUT:
+            print("The subprocess has exceeded the time limit and was terminated.")
+            break
+        except expect.EOF:
+            print("The subprocess has finished running.")
+            break
+
+    proc.close()
diff --git a/agbenchmark/conftest.py b/agbenchmark/conftest.py
index 2590ce78..25510e42 100644
--- a/agbenchmark/conftest.py
+++ b/agbenchmark/conftest.py
@@ -6,9 +6,7 @@ import subprocess
 import sys
 from agbenchmark.tests.regression.RegressionManager import RegressionManager
 from agbenchmark.mocks.MockManager import MockManager
-from dotenv import load_dotenv
-
-load_dotenv()
+from agbenchmark.benchmark import run_agnostic
 
 
 @pytest.fixture(scope="module")
@@ -43,18 +41,6 @@ def pytest_addoption(parser):
     parser.addoption("--mock", action="store_true", default=False)
 
 
-def check_cycle_count(cycle_count: int, cutoff: int, proc):
-    """Increment, print, and check cycle count."""
-    cycle_count += 1
-    print(f"Cycle count: {cycle_count}")
-    if cycle_count >= cutoff:
-        proc.terminate(force=True)
-    return cycle_count
-
-
-AGENT_NAME = os.getenv("AGENT_NAME")
-
-
 @pytest.fixture(autouse=True)
 def run_agent(request, config):
     """Calling to get a response"""
@@ -75,50 +61,7 @@ def run_agent(request, config):
         else:
             print("No mock provided")
     else:
-        path = os.path.join(os.getcwd(), f"agent\\{AGENT_NAME}")
-
-        timeout = sys.maxsize
-
-        if config["cutoff"]["type"] == "time":
-            timeout = config["cutoff"]["count"] or 60
-            
-        from pexpect.popen_spawn import PopenSpawn
-
-        print(f"Running {task} with timeout {timeout}")
-
-        # Starting the subprocess using pexpect
-        proc = PopenSpawn("python", ["miniagi.py", task], timeout=timeout, cwd=path)
-
-        print("proc", proc)
-
-        cycle_count = 0
-
-        while True:
-            try:
-                # If we get the prompt for user input, we send "\n"
-                if config["cutoff"]["type"] == "user_input":
-                    proc.expect([config["cutoff"]["user_prompt"]])
-                    proc.sendline(config["cutoff"]["user_input"])
-                    cycle_count = check_cycle_count(
-                        cycle_count, config["cutoff"]["count"], proc
-                    )
-                elif config["cutoff"]["type"] == "cycle_count":
-                    match = proc.expect([r"Cycle count: (\d+)"])
-                    if match is not None:
-                        cycle_count = int(match.group(1))  # type: ignore
-                        cycle_count = check_cycle_count(
-                            cycle_count, config["cutoff"]["count"], proc
-                        )
-
-                # for cutoff type "time", just let it run until timeout
-            except expect.TIMEOUT:
-                print("The subprocess has exceeded the time limit and was terminated.")
-                break
-            except expect.EOF:
-                print("The subprocess has finished running.")
-                break
-
-        proc.close()
+        run_agnostic(config, task)
 
 
 regression_json = "agbenchmark/tests/regression/regression_tests.json"