Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

simutaneous -> simultaneous; allow CI to be run from PR #97

Merged
merged 1 commit into from
Jun 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion .github/workflows/mypy.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
name: Mypy
on: [push]
on:
push:
branches:
- main
- release
- dev
pull_request:
branches:
- main
- release

jobs:
Static-Type-Checking:
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
name: Pytest
on: [push]
on:
push:
branches:
- main
- release
- dev
pull_request:
branches:
- main
- release

jobs:
Pytest:
Expand Down
4 changes: 2 additions & 2 deletions sotopia/envs/parallel.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def __init__(
available_action_types: set[ActionType] = set(
["none", "speak", "non-verbal communication", "action", "leave"]
),
action_order: Literal["simutaneous", "round-robin", "random"] = "simutaneous",
action_order: Literal["simultaneous", "round-robin", "random"] = "simultaneous",
model_name: str = "gpt-3.5-turbo",
evaluators: list[Evaluator] = [],
terminal_evaluators: list[Evaluator] = [],
Expand All @@ -138,7 +138,7 @@ def __init__(

Args:
available_action_types (set[ActionType], optional): The action types that are available to the agents. Defaults to set(["none", "speak", "non-verbal communication", "action"]).
action_order (Literal["simutaneous", "round-robin", "random"], optional): The order in which the agents take actions. Defaults to "simutaneous".
action_order (Literal["simultaneous", "round-robin", "random"], optional): The order in which the agents take actions. Defaults to "simultaneous".
model_name (str, optional): The name of the language model to use. Defaults to "gpt-3.5-turbo".
"""
super().__init__()
Expand Down
4 changes: 2 additions & 2 deletions sotopia/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
@beartype
def run_sync_server(
model_name_dict: dict[str, LLM_Name],
action_order: Literal["simutaneous", "round-robin", "random"],
action_order: Literal["simultaneous", "round-robin", "random"],
agents_info: dict[str, dict[str, str]] | None = None,
partial_background_file: str | None = None,
full_background_file: str | None = None,
Expand Down Expand Up @@ -232,7 +232,7 @@ async def arun_one_episode(
async def run_async_server(
model_dict: dict[str, LLM_Name],
sampler: BaseSampler[Observation, AgentAction] = BaseSampler(),
action_order: Literal["simutaneous", "round-robin", "random"] = "round-robin",
action_order: Literal["simultaneous", "round-robin", "random"] = "round-robin",
env_agent_combo_list: list[EnvAgentCombo[Observation, AgentAction]] = [],
omniscient: bool = False,
script_like: bool = False,
Expand Down
Loading