fix merge conflict

openadapt/.cache/joblib/openadapt/strategies/mixins/openai/create_openai_completion/func_code.py

@@ -0,0 +1,30 @@
+# first line: 76
+@cache.cache()
+def create_openai_completion(
+    model,
+    messages,
+    # temperatere=1,
+    # top_p=1,
+    # n=1,
+    # stream=False,
+    # stop=None,
+    # max_tokens=inf,
+    # presence_penalty=0,
+    # frequency_penalty=0,
+    # logit_bias=None,
+    # user=None,
+):
+    return openai.ChatCompletion.create(
+        model=model,
+        messages=messages,
+        # temperatere=temperature,
+        # top_p=top_p,
+        # n=n,
+        # stream=stream,
+        # stop=stop,
+        # max_tokens=max_tokens,
+        # presence_penalty=presence_penalty,
+        # frequency_penalty=frequency_penalty,
+        # logit_bias=logit_bias,
+        # user=user,
+    )

openadapt/strategies/__init__.py

@@ -1,4 +1,5 @@
 from openadapt.strategies.base import BaseReplayStrategy
 from openadapt.strategies.naive import NaiveReplayStrategy
 from openadapt.strategies.demo import DemoReplayStrategy
+from openadapt.strategies.stateful import StatefulReplayStrategy
 # add more strategies here

openadapt/strategies/stateful.py

@@ -124,6 +124,7 @@ def get_next_action_event(
         logger.debug(f"active_action_dicts=\n{pformat(active_action_dicts)}")
         active_action = models.ActionEvent.from_children(active_action_dicts)
         self.recording_action_idx += 1
+        import ipdb; ipdb.set_trace()
         return active_action