Add local file config in isort & Add missing copyright info (#547)

lihuoran · web-flow · commit 8c0ad5a13d47 · 2022-06-14T14:47:47.000+08:00
* Add local file config; add missing copyright info.

* Add empty line at the end of pyproject.toml

* Reward calculating bug fix
diff --git a/.github/linters/pyproject.toml b/.github/linters/pyproject.toml
@@ -4,4 +4,5 @@ line-length = 120
 [tool.isort]
 profile = "black"
 line_length = 120
-known_first_party = "maro"
+known_first_party = ["maro"]
+known_local_folder = ["examples", "scripts", "tests"]
diff --git a/examples/cim/rl/algorithms/__init__.py b/examples/cim/rl/algorithms/__init__.py
@@ -0,0 +1,2 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
diff --git a/examples/cim/rl/algorithms/ppo.py b/examples/cim/rl/algorithms/ppo.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 import torch
 
 from maro.rl.policy import DiscretePolicyGradient
diff --git a/examples/cim/rl/rl_component_bundle.py b/examples/cim/rl/rl_component_bundle.py
@@ -1,9 +1,9 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 from functools import partial
 from typing import Any, Callable, Dict, Optional
 
-from examples.cim.rl.config import action_num, algorithm, env_conf, num_agents, reward_shaping_conf, state_dim
-from examples.cim.rl.env_sampler import CIMEnvSampler
-
 from maro.rl.policy import AbsPolicy
 from maro.rl.rl_component.rl_component_bundle import RLComponentBundle
 from maro.rl.rollout import AbsEnvSampler
@@ -13,6 +13,8 @@
 from .algorithms.dqn import get_dqn, get_dqn_policy
 from .algorithms.maddpg import get_maddpg, get_maddpg_policy
 from .algorithms.ppo import get_ppo, get_ppo_policy
+from examples.cim.rl.config import action_num, algorithm, env_conf, num_agents, reward_shaping_conf, state_dim
+from examples.cim.rl.env_sampler import CIMEnvSampler
 
 
 class CIMBundle(RLComponentBundle):
diff --git a/examples/citi_bike/greedy/__init__.py b/examples/citi_bike/greedy/__init__.py
@@ -0,0 +1,2 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
diff --git a/examples/citi_bike/greedy/launcher.py b/examples/citi_bike/greedy/launcher.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 import heapq
 import io
 import os
diff --git a/examples/citi_bike/online_lp/__init__.py b/examples/citi_bike/online_lp/__init__.py
@@ -0,0 +1,2 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
diff --git a/examples/citi_bike/online_lp/citi_bike_ilp.py b/examples/citi_bike/online_lp/citi_bike_ilp.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 import math
 from typing import List, Tuple
 
diff --git a/examples/citi_bike/online_lp/launcher.py b/examples/citi_bike/online_lp/launcher.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 import argparse
 import io
 import math
diff --git a/examples/rl/run_rl_example.py b/examples/rl/run_rl_example.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 import argparse
 
 from maro.cli.local.commands import run
diff --git a/examples/simulator/data_model.py b/examples/simulator/data_model.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 from maro.backends.frame import FrameBase, FrameNode, NodeAttribute, NodeBase, node
 
 TOTAL_PRODUCT_CATEGORIES = 10
diff --git a/examples/vm_scheduling/offline_lp/__init__.py b/examples/vm_scheduling/offline_lp/__init__.py
@@ -0,0 +1,2 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
diff --git a/examples/vm_scheduling/offline_lp/launcher.py b/examples/vm_scheduling/offline_lp/launcher.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 import io
 import os
 import pprint
diff --git a/examples/vm_scheduling/rl/algorithms/__init__.py b/examples/vm_scheduling/rl/algorithms/__init__.py
@@ -0,0 +1,2 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
diff --git a/examples/vm_scheduling/rl/rl_component_bundle.py b/examples/vm_scheduling/rl/rl_component_bundle.py
@@ -1,16 +1,19 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 from functools import partial
 from typing import Any, Callable, Dict, Optional
 
-from examples.vm_scheduling.rl.algorithms.ac import get_ac, get_ac_policy
-from examples.vm_scheduling.rl.algorithms.dqn import get_dqn, get_dqn_policy
-from examples.vm_scheduling.rl.config import algorithm, env_conf, num_features, num_pms, state_dim, test_env_conf
-from examples.vm_scheduling.rl.env_sampler import VMEnvSampler
-
 from maro.rl.policy import AbsPolicy
 from maro.rl.rl_component.rl_component_bundle import RLComponentBundle
 from maro.rl.rollout import AbsEnvSampler
 from maro.rl.training import AbsTrainer
 
+from examples.vm_scheduling.rl.algorithms.ac import get_ac, get_ac_policy
+from examples.vm_scheduling.rl.algorithms.dqn import get_dqn, get_dqn_policy
+from examples.vm_scheduling.rl.config import algorithm, env_conf, num_features, num_pms, state_dim, test_env_conf
+from examples.vm_scheduling.rl.env_sampler import VMEnvSampler
+
 
 class VMBundle(RLComponentBundle):
     def get_env_config(self) -> dict:
diff --git a/examples/vm_scheduling/rule_based_algorithm/__init__.py b/examples/vm_scheduling/rule_based_algorithm/__init__.py
@@ -0,0 +1,2 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
diff --git a/examples/vm_scheduling/rule_based_algorithm/agent.py b/examples/vm_scheduling/rule_based_algorithm/agent.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 from maro.simulator import Env
 from maro.simulator.scenarios.vm_scheduling import AllocateAction, DecisionPayload, PostponeAction
 from maro.simulator.scenarios.vm_scheduling.common import Action
diff --git a/examples/vm_scheduling/rule_based_algorithm/best_fit.py b/examples/vm_scheduling/rule_based_algorithm/best_fit.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 import numpy as np
 from rule_based_algorithm import RuleBasedAlgorithm
 
diff --git a/examples/vm_scheduling/rule_based_algorithm/bin_packing.py b/examples/vm_scheduling/rule_based_algorithm/bin_packing.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 import random
 
 import numpy as np
diff --git a/examples/vm_scheduling/rule_based_algorithm/first_fit.py b/examples/vm_scheduling/rule_based_algorithm/first_fit.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 from rule_based_algorithm import RuleBasedAlgorithm
 
 from maro.simulator import Env
diff --git a/examples/vm_scheduling/rule_based_algorithm/launcher.py b/examples/vm_scheduling/rule_based_algorithm/launcher.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 import importlib
 import io
 import os
diff --git a/examples/vm_scheduling/rule_based_algorithm/random_pick.py b/examples/vm_scheduling/rule_based_algorithm/random_pick.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 import random
 
 from rule_based_algorithm import RuleBasedAlgorithm
diff --git a/examples/vm_scheduling/rule_based_algorithm/round_robin.py b/examples/vm_scheduling/rule_based_algorithm/round_robin.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 from rule_based_algorithm import RuleBasedAlgorithm
 
 from maro.simulator import Env
diff --git a/examples/vm_scheduling/rule_based_algorithm/rule_based_algorithm.py b/examples/vm_scheduling/rule_based_algorithm/rule_based_algorithm.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 import abc
 
 from maro.simulator import Env
diff --git a/maro/cli/data_pipeline/__init__.py b/maro/cli/data_pipeline/__init__.py
@@ -1,2 +1,2 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT license.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
diff --git a/maro/cli/data_pipeline/citi_bike.py b/maro/cli/data_pipeline/citi_bike.py
@@ -1,5 +1,5 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT license.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
 
 import csv
 import os
diff --git a/maro/cli/data_pipeline/data_process.py b/maro/cli/data_pipeline/data_process.py
@@ -1,5 +1,5 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT license.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
 
 from maro.cli.data_pipeline.citi_bike import CitiBikeProcess
 from maro.cli.data_pipeline.vm_scheduling import VmSchedulingProcess
diff --git a/maro/cli/data_pipeline/utils.py b/maro/cli/data_pipeline/utils.py
@@ -1,5 +1,5 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT license.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
 
 import json
 import os
diff --git a/maro/cli/data_pipeline/vm_scheduling.py b/maro/cli/data_pipeline/vm_scheduling.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 import gzip
 import os
 import shutil
diff --git a/maro/cli/grass/lib/services/master_api_server/blueprints/visible.py b/maro/cli/grass/lib/services/master_api_server/blueprints/visible.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 from flask import Blueprint
 
 from ..jwt_wrapper import check_jwt_validity
diff --git a/maro/cli/utils/web_terminal/terminal-srv.py b/maro/cli/utils/web_terminal/terminal-srv.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 import argparse
 import fcntl
 import json
diff --git a/maro/data_lib/cim/port_buffer_tick_wrapper.py b/maro/data_lib/cim/port_buffer_tick_wrapper.py
@@ -1,5 +1,6 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT license.
+
 from math import ceil
 from typing import Callable
 
diff --git a/maro/event_buffer/event.py b/maro/event_buffer/event.py
@@ -1,5 +1,6 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT license.
+
 import abc
 from typing import Optional
 
diff --git a/maro/event_buffer/event_linked_list.py b/maro/event_buffer/event_linked_list.py
@@ -1,5 +1,6 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT license.
+
 from typing import List, Optional, Union
 
 from .event import AbsEvent, ActualEvent, CascadeEvent, DummyEvent
diff --git a/maro/event_buffer/event_pool.py b/maro/event_buffer/event_pool.py
@@ -1,5 +1,6 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT license.
+
 from itertools import count
 from typing import Iterable, Iterator, List, Union
 
diff --git a/maro/forecasting/moving_average.py b/maro/forecasting/moving_average.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 from abc import ABC, abstractmethod
 from collections import deque
 from typing import Iterable
diff --git a/maro/rl/model/algorithm_nets/__init__.py b/maro/rl/model/algorithm_nets/__init__.py
@@ -0,0 +1,2 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
diff --git a/maro/rl/model/algorithm_nets/ac_based.py b/maro/rl/model/algorithm_nets/ac_based.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 from abc import ABCMeta
 from typing import Tuple
 
diff --git a/maro/rl/model/algorithm_nets/ddpg.py b/maro/rl/model/algorithm_nets/ddpg.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 from abc import ABCMeta
 from typing import Tuple
 
diff --git a/maro/rl/model/algorithm_nets/sac.py b/maro/rl/model/algorithm_nets/sac.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 from abc import ABCMeta
 from typing import Tuple
 
diff --git a/maro/rl/rl_component/__init__.py b/maro/rl/rl_component/__init__.py
@@ -0,0 +1,2 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
diff --git a/maro/rl/rollout/env_sampler.py b/maro/rl/rollout/env_sampler.py
@@ -376,6 +376,7 @@ def _calc_reward(self, cache_element: CacheElement) -> None:
             cache_element.event,
             cache_element.tick,
         )
+        cache_element.reward_dict = {agent: cache_element.reward_dict[agent] for agent in cache_element.agent_names}
 
     def _append_cache_element(self, cache_element: Optional[CacheElement]) -> None:
         """`cache_element` == None means we are processing the last element in trans_cache"""
diff --git a/maro/rl/training/algorithms/dqn.py b/maro/rl/training/algorithms/dqn.py
@@ -1,5 +1,6 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT license.
+
 from dataclasses import dataclass
 from typing import Callable, Dict
 
diff --git a/maro/rl/training/algorithms/sac.py b/maro/rl/training/algorithms/sac.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 from dataclasses import dataclass
 from typing import Callable, Dict, Optional, Tuple
 
diff --git a/maro/rl/training/trainer.py b/maro/rl/training/trainer.py
@@ -1,5 +1,6 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT license.
+
 import collections
 import os
 from abc import ABCMeta, abstractmethod
diff --git a/maro/rl/utils/training.py b/maro/rl/utils/training.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 import os
 
 
diff --git a/maro/rl/utils/transition_batch.py b/maro/rl/utils/transition_batch.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 from __future__ import annotations
 
 from dataclasses import dataclass
diff --git a/maro/rl/workflows/main.py b/maro/rl/workflows/main.py
@@ -1,5 +1,6 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT license.
+
 import argparse
 import importlib
 import os
diff --git a/maro/rl/workflows/rollout_worker.py b/maro/rl/workflows/rollout_worker.py
@@ -1,5 +1,6 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT license.
+
 import importlib
 import os
 import sys
diff --git a/maro/rl/workflows/train_worker.py b/maro/rl/workflows/train_worker.py
@@ -1,5 +1,6 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT license.
+
 import importlib
 import os
 import sys
diff --git a/maro/simulator/scenarios/cim/topologies/config_auto_generator.py b/maro/simulator/scenarios/cim/topologies/config_auto_generator.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 import math
 import os
 import random
diff --git a/maro/simulator/utils/event_bind_binreader.py b/maro/simulator/utils/event_bind_binreader.py
@@ -1,5 +1,5 @@
 # Copyright (c) Microsoft Corporation.
-# Licensed under the MIT license.s
+# Licensed under the MIT license.
 
 from datetime import datetime
 
diff --git a/maro/utils/checkpoint.py b/maro/utils/checkpoint.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 import io
 import os
 from abc import ABC, abstractmethod
diff --git a/maro/utils/exception/__init__.py b/maro/utils/exception/__init__.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 from .base_exception import MAROException
 from .error_code import ERROR_CODE
 
diff --git a/scripts/launch_realtime_vis.py b/scripts/launch_realtime_vis.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 """
 This script is used to launch data and vis services, and the start the experiment script.
 
diff --git a/tests/checkpoint/test_checkpoint.py b/tests/checkpoint/test_checkpoint.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 import json
 import logging
 import os
diff --git a/tests/cim/__init__.py b/tests/cim/__init__.py
@@ -0,0 +1,2 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
diff --git a/tests/cim/test_cim_scenario.py b/tests/cim/test_cim_scenario.py
diff --git a/tests/citi_bike/test_bike_scenario.py b/tests/citi_bike/test_bike_scenario.py
diff --git a/tests/cli/grass/test_grass_azure.py b/tests/cli/grass/test_grass_azure.py
diff --git a/tests/cli/grass/test_grass_on_premises.py b/tests/cli/grass/test_grass_on_premises.py
diff --git a/tests/cli/k8s/test_k8s_aks.py b/tests/cli/k8s/test_k8s_aks.py
diff --git a/tests/communication/__init__.py b/tests/communication/__init__.py
diff --git a/tests/communication/test_decorator.py b/tests/communication/test_decorator.py
diff --git a/tests/communication/test_proxy.py b/tests/communication/test_proxy.py
diff --git a/tests/communication/test_rejoin.py b/tests/communication/test_rejoin.py
diff --git a/tests/test_binary_convert_read.py b/tests/test_binary_convert_read.py
diff --git a/tests/test_env.py b/tests/test_env.py
diff --git a/tests/test_event_buffer.py b/tests/test_event_buffer.py
diff --git a/tests/test_frame.py b/tests/test_frame.py
diff --git a/tests/test_snapshot.py b/tests/test_snapshot.py

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Copyright (c) Microsoft Corporation.`
	`2`	`+# Licensed under the MIT license.`