Merged PR 349: #2511 - Upgraded pydantic to version 2.7.0

## Summary
- Upgraded pydantic to version 2.7.0.
- Added ipywidgets to the dependencies (for #2300)

## Test process
N/A

## Checklist
- [X] PR is linked to a **work item**
- [X] **acceptance criteria** of linked ticket are met
- [X] performed **self-review** of the code
- [ ] written **tests** for any new functionality added with this PR
- [ ] updated the **documentation** if this PR changes or adds functionality
- [ ] written/updated **design docs** if this PR implements new functionality
- [X] updated the **change log**
- [X] ran **pre-commit** checks for code style
- [ ] attended to any **TO-DOs** left in the code

#2511 - Upgraded pydantic to version 2.7.0. Added ipywidgets to the dependencies (for #2300)

Related work items: #2300, #2511
This commit is contained in:
Christopher McCarthy
2024-04-23 13:43:44 +00:00
5 changed files with 11 additions and 7 deletions

View File

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## 3.0.0b9 ## 3.0.0b9
- Removed deprecated `PrimaiteSession` class. - Removed deprecated `PrimaiteSession` class.
- Upgraded pydantic to version 2.7.0
- Upgraded Ray to version >= 2.9
- Added ipywidgets to the dependencies
## [Unreleased] ## [Unreleased]
- Made requests fail to reach their target if the node is off - Made requests fail to reach their target if the node is off

View File

@@ -38,8 +38,9 @@ dependencies = [
"stable-baselines3[extra]==2.1.0", "stable-baselines3[extra]==2.1.0",
"tensorflow==2.12.0", "tensorflow==2.12.0",
"typer[all]==0.9.0", "typer[all]==0.9.0",
"pydantic==2.1.1", "pydantic==2.7.0",
"ray[rllib] == 2.8.0, < 3" "ray[rllib] >= 2.9, < 3",
"ipywidgets"
] ]
[tool.setuptools.dynamic] [tool.setuptools.dynamic]

View File

@@ -1,6 +1,6 @@
"""Manages the observation space for the agent.""" """Manages the observation space for the agent."""
from abc import ABC, abstractmethod from abc import ABC, abstractmethod
from typing import Any, Dict, Iterable, Type from typing import Any, Dict, Iterable, Optional, Type, Union
from gymnasium import spaces from gymnasium import spaces
from gymnasium.core import ObsType from gymnasium.core import ObsType
@@ -9,7 +9,7 @@ from pydantic import BaseModel, ConfigDict
from primaite import getLogger from primaite import getLogger
_LOGGER = getLogger(__name__) _LOGGER = getLogger(__name__)
WhereType = Iterable[str | int] | None WhereType = Optional[Iterable[Union[str, int]]]
class AbstractObservation(ABC): class AbstractObservation(ABC):

View File

@@ -26,7 +26,7 @@ the structure:
``` ```
""" """
from abc import abstractmethod from abc import abstractmethod
from typing import Callable, Dict, Iterable, List, Optional, Tuple, Type, TYPE_CHECKING from typing import Callable, Dict, Iterable, List, Optional, Tuple, Type, TYPE_CHECKING, Union
from typing_extensions import Never from typing_extensions import Never
@@ -37,7 +37,7 @@ if TYPE_CHECKING:
from primaite.game.agent.interface import AgentActionHistoryItem from primaite.game.agent.interface import AgentActionHistoryItem
_LOGGER = getLogger(__name__) _LOGGER = getLogger(__name__)
WhereType = Iterable[str | int] | None WhereType = Optional[Iterable[Union[str, int]]]
class AbstractReward: class AbstractReward:

View File

@@ -236,7 +236,7 @@ class DatabaseClient(Application):
if not connection_id: if not connection_id:
msg = "Cannot run sql query, could not establish connection with the server." msg = "Cannot run sql query, could not establish connection with the server."
self.parent.sys_log(msg) self.parent.sys_log.error(msg)
return False return False
uuid = str(uuid4()) uuid = str(uuid4())