[Cherry-pick for 2.0.1 verified patch] default analytics channel (#5511) (#5584)

* update changelog from #5511

* set gym=0.20.0 #5540, update changelog

* Cap cattrs version for now(#5397)

* clean up

Co-authored-by: Vincent-Pierre BERGES <[email protected]>
Co-authored-by: Ruo-Ping Dong <[email protected]>

Author: 3 people

com.unity.ml-agents/CHANGELOG.md

@@ -9,6 +9,9 @@ and this project adheres to
 ### Minor Changes
 #### com.unity.ml-agents (C#)
 - Upgrade to 2.0.1
+#### ml-agents / ml-agents-envs / gym-unity (Python)
+- Set gym version in gym-unity to gym release 0.20.0
+- Added minimal analytics collection to LL-API (#5511)
 
 ## [2.0.0] - 2021-09-01
 ### Minor Changes

gym-unity/gym_unity/tests/test_gym.py

@@ -248,7 +248,7 @@ def create_mock_vector_steps(specs, num_agents=1, number_visual_observations=0):
     :BehaviorSpecs specs: The BehaviorSpecs for this mock
     :int num_agents: Number of "agents" to imitate in your BatchedStepResult values.
     """
-    obs = [np.array([num_agents * [1, 2, 3]]).reshape(num_agents, 3)]
+    obs = [np.array([num_agents * [1, 2, 3]], dtype=np.float32).reshape(num_agents, 3)]
     if number_visual_observations:
         obs += [
             np.zeros(shape=(num_agents, 8, 8, 3), dtype=np.float32)

gym-unity/setup.py

@@ -38,6 +38,6 @@ def run(self):
     author_email="[email protected]",
     url="https://github.com/Unity-Technologies/ml-agents",
     packages=find_packages(),
-    install_requires=["gym", f"mlagents_envs=={VERSION}"],
+    install_requires=["gym==0.20.0", f"mlagents_envs=={VERSION}"],
     cmdclass={"verify": VerifyVersionCommand},
 )

junit/test-results.xml

@@ -10,6 +10,7 @@
 
 from mlagents_envs.logging_util import get_logger
 from mlagents_envs.side_channel.side_channel import SideChannel
+from mlagents_envs.side_channel import DefaultTrainingAnalyticsSideChannel
 from mlagents_envs.side_channel.side_channel_manager import SideChannelManager
 from mlagents_envs import env_utils
 
@@ -186,6 +187,16 @@ def __init__(
         self._timeout_wait: int = timeout_wait
         self._communicator = self._get_communicator(worker_id, base_port, timeout_wait)
         self._worker_id = worker_id
+        if side_channels is None:
+            side_channels = []
+        default_training_side_channel: Optional[
+            DefaultTrainingAnalyticsSideChannel
+        ] = None
+        if DefaultTrainingAnalyticsSideChannel.CHANNEL_ID not in [
+            _.channel_id for _ in side_channels
+        ]:
+            default_training_side_channel = DefaultTrainingAnalyticsSideChannel()
+            side_channels.append(default_training_side_channel)
         self._side_channel_manager = SideChannelManager(side_channels)
         self._log_folder = log_folder
         self.academy_capabilities: UnityRLCapabilitiesProto = None  # type: ignore
@@ -246,6 +257,8 @@ def __init__(
         self._is_first_message = True
         self._update_behavior_specs(aca_output)
         self.academy_capabilities = aca_params.capabilities
+        if default_training_side_channel is not None:
+            default_training_side_channel.environment_initialized()
 
     @staticmethod
     def _get_communicator(worker_id, base_port, timeout_wait):

ml-agents-envs/mlagents_envs/environment.py

@@ -2,3 +2,6 @@
 from mlagents_envs.side_channel.outgoing_message import OutgoingMessage  # noqa
 
 from mlagents_envs.side_channel.side_channel import SideChannel  # noqa
+from mlagents_envs.side_channel.default_training_analytics_side_channel import (  # noqa
+    DefaultTrainingAnalyticsSideChannel,  # noqa
+)  # noqa

ml-agents-envs/mlagents_envs/side_channel/__init__.py

@@ -0,0 +1,49 @@
+import sys
+import uuid
+import mlagents_envs
+
+from mlagents_envs.exception import UnityCommunicationException
+from mlagents_envs.side_channel import SideChannel, IncomingMessage, OutgoingMessage
+from mlagents_envs.communicator_objects.training_analytics_pb2 import (
+    TrainingEnvironmentInitialized,
+)
+from google.protobuf.any_pb2 import Any
+
+
+class DefaultTrainingAnalyticsSideChannel(SideChannel):
+    """
+    Side channel that sends information about the training to the Unity environment so it can be logged.
+    """
+
+    CHANNEL_ID = uuid.UUID("b664a4a9-d86f-5a5f-95cb-e8353a7e8356")
+
+    def __init__(self) -> None:
+        # >>> uuid.uuid5(uuid.NAMESPACE_URL, "com.unity.ml-agents/TrainingAnalyticsSideChannel")
+        # UUID('b664a4a9-d86f-5a5f-95cb-e8353a7e8356')
+        # We purposefully use the SAME side channel as the TrainingAnalyticsSideChannel
+
+        super().__init__(DefaultTrainingAnalyticsSideChannel.CHANNEL_ID)
+
+    def on_message_received(self, msg: IncomingMessage) -> None:
+        raise UnityCommunicationException(
+            "The DefaultTrainingAnalyticsSideChannel received a message from Unity, "
+            + "this should not have happened."
+        )
+
+    def environment_initialized(self) -> None:
+        # Tuple of (major, minor, patch)
+        vi = sys.version_info
+
+        msg = TrainingEnvironmentInitialized(
+            python_version=f"{vi[0]}.{vi[1]}.{vi[2]}",
+            mlagents_version="Custom",
+            mlagents_envs_version=mlagents_envs.__version__,
+            torch_version="Unknown",
+            torch_device_type="Unknown",
+        )
+        any_message = Any()
+        any_message.Pack(msg)
+
+        env_init_msg = OutgoingMessage()
+        env_init_msg.set_raw_bytes(any_message.SerializeToString())  # type: ignore
+        super().queue_message_to_send(env_init_msg)

ml-agents-envs/mlagents_envs/side_channel/default_training_analytics_side_channel.py

@@ -1,12 +1,15 @@
 import sys
 from typing import Optional
-import uuid
 import mlagents_envs
 import mlagents.trainers
 from mlagents import torch_utils
 from mlagents.trainers.settings import RewardSignalType
 from mlagents_envs.exception import UnityCommunicationException
-from mlagents_envs.side_channel import SideChannel, IncomingMessage, OutgoingMessage
+from mlagents_envs.side_channel import (
+    IncomingMessage,
+    OutgoingMessage,
+    DefaultTrainingAnalyticsSideChannel,
+)
 from mlagents_envs.communicator_objects.training_analytics_pb2 import (
     TrainingEnvironmentInitialized,
     TrainingBehaviorInitialized,
@@ -16,15 +19,16 @@
 from mlagents.trainers.settings import TrainerSettings, RunOptions
 
 
-class TrainingAnalyticsSideChannel(SideChannel):
+class TrainingAnalyticsSideChannel(DefaultTrainingAnalyticsSideChannel):
     """
     Side channel that sends information about the training to the Unity environment so it can be logged.
     """
 
     def __init__(self) -> None:
         # >>> uuid.uuid5(uuid.NAMESPACE_URL, "com.unity.ml-agents/TrainingAnalyticsSideChannel")
         # UUID('b664a4a9-d86f-5a5f-95cb-e8353a7e8356')
-        super().__init__(uuid.UUID("b664a4a9-d86f-5a5f-95cb-e8353a7e8356"))
+        # Use the same uuid as the parent side channel
+        super().__init__()
         self.run_options: Optional[RunOptions] = None
 
     def on_message_received(self, msg: IncomingMessage) -> None:

ml-agents/mlagents/training_analytics_side_channel.py

@@ -74,7 +74,7 @@ def run(self):
         # cattrs 1.1.0 dropped support for python 3.6, but 1.0.0 doesn't work for python 3.9
         # Since there's no version that supports both, we have to draw the line somwehere.
         "cattrs<1.1.0; python_version<'3.8'",
-        "cattrs>=1.1.0; python_version>='3.8'",
+        "cattrs>=1.1.0,<1.7; python_version>='3.8'",
         "attrs>=19.3.0",
         'pypiwin32==223;platform_system=="Windows"',
         "importlib_metadata; python_version<'3.8'",