done

oppia · vojtechjelinek · Jan 19, 2022 · Nov 27, 2021 · Nov 28, 2021 · Dec 4, 2021
commit 9667b756a918a182c18a1c2f30286545183f80ec
@@ -33,6 +33,8 @@
 from core.platform import models
 from core.tests import test_utils
 
+from typing import Any, Dict
+
 memory_cache_services = models.Registry.import_cache_services()
 
 
@@ -249,34 +251,34 @@ def test_serialization_and_deserialization_returns_the_same_object(
                 'exp_id_1', title='A title', category='A category'))
         self.assertEqual(
             default_exploration.to_dict(),
-            deserialize(serialize(default_exploration)).to_dict())
+            deserialize(serialize(default_exploration)).to_dict()) # type: ignore[operator]
 CACHE_NAMESPACE_SKILL: lambda x: x.serialize(), 
 CACHE_NAMESPACE_SKILL: lambda x: x.serialize(), 
 
     def test_invalid_namespace_raises_error(self) -> None:
         invalid_namespace = 'invalid'
         key_value_mapping = {'a': '1', 'b': '2', 'c': '3'}
 
-        with self.assertRaisesRegexp(
+        with self.assertRaisesRegexp(# type: ignore[no-untyped-call]
             ValueError,
             'Invalid namespace: %s.' % invalid_namespace):
             caching_services.set_multi(
                 invalid_namespace, None,
                 key_value_mapping)
 
-        with self.assertRaisesRegexp(
+        with self.assertRaisesRegexp(# type: ignore[no-untyped-call]
             ValueError,
             'Invalid namespace: %s.' % invalid_namespace):
             caching_services.get_multi(
                 invalid_namespace, None,
                 ['a', 'b', 'c'])
 
-        with self.assertRaisesRegexp(
+        with self.assertRaisesRegexp(# type: ignore[no-untyped-call]
             ValueError,
             'Invalid namespace: %s.' % invalid_namespace):
             caching_services.delete_multi(
                 invalid_namespace, None, ['a', 'b', 'c'])
 
         invalid_sub_namespace = 'sub:namespace'
-        with self.assertRaisesRegexp(
+        with self.assertRaisesRegexp(# type: ignore[no-untyped-call]
             ValueError,
             'Sub-namespace %s cannot contain \':\'.' % invalid_sub_namespace):
             caching_services.get_multi(
@@ -390,7 +392,7 @@ def test_partial_fetches_returns_correct_elements(self) -> None:
 
         self.assertEqual(
             default_exploration.to_dict(),
-            result.get(exploration_id).to_dict())
+            result.get(exploration_id).to_dict()) # type: ignore[union-attr]
 
         self.assertFalse(nonexistent_exploration_id in result)
 
@@ -437,7 +439,7 @@ def test_queries_to_wrong_sub_namespace_returns_none(self) -> None:
             '1',
             [exploration_id])
         self.assertEqual(
-            existent_result.get(exploration_id).to_dict(),
+            existent_result.get(exploration_id).to_dict(),# type: ignore[union-attr]
             default_exploration.to_dict())
 
     def test_set_multi_returns_true_for_successful_insert_into_cache(
@@ -570,7 +572,8 @@ def test_config_properties_identically_cached_in_dev_and_test_environment(
         server should be the same as the string that is set to the testing cache
         on the testing server.
         """
-        def mock_memory_cache_services_set_multi(id_value_mapping) -> None:
+        def mock_memory_cache_services_set_multi(
+            id_value_mapping: Dict[str, str]) -> None:
             # This mock asserts that for the same config domain attribute
             # containing unicode characters, the string that is set to the cache
             # in the testing environment is the same as the string set to the
@@ -648,7 +651,8 @@ def test_explorations_identically_cached_in_dev_and_test_environment(
         default_exploration = exp_domain.Exploration.from_dict(
             self.exploration_dict_with_unicode_characters)
 
-        def mock_memory_cache_services_set_multi(id_value_mapping) -> None:
+        def mock_memory_cache_services_set_multi(
+            id_value_mapping: Dict[str, Any]) -> None:
             # The json encoded string is the string that is set to the cache
             # when an exploration is created in the development server. This
             # mock asserts that for the same exploration, the string

diff --git a/core/domain/collection_domain.py b/core/domain/collection_domain.py
@@ -303,10 +303,11 @@ def to_dict(self):
 
     @classmethod
     def create_default_collection(
-            cls, collection_id, title=feconf.DEFAULT_COLLECTION_TITLE,
-            category=feconf.DEFAULT_COLLECTION_CATEGORY,
-            objective=feconf.DEFAULT_COLLECTION_OBJECTIVE,
-            language_code=constants.DEFAULT_LANGUAGE_CODE):
+            cls, collection_id: str,
+            title: str =feconf.DEFAULT_COLLECTION_TITLE,
+            category: str =feconf.DEFAULT_COLLECTION_CATEGORY,
+            objective: str =feconf.DEFAULT_COLLECTION_OBJECTIVE,
+            language_code: str =constants.DEFAULT_LANGUAGE_CODE):
         """Returns a Collection domain object with default values.
 
         Args:

diff --git a/core/domain/exp_domain.py b/core/domain/exp_domain.py
@@ -25,6 +25,7 @@
 
 import collections
 import copy
+import datetime
 import json
 import re
 import string
@@ -41,6 +42,8 @@
 from core.domain import state_domain
 from core.platform import models
 
+from typing import Any, Dict
+
 (exp_models,) = models.Registry.import_models([models.NAMES.exploration])
 
 
@@ -620,11 +623,13 @@ def __init__(
 
     @classmethod
     def create_default_exploration(
-            cls, exploration_id, title=feconf.DEFAULT_EXPLORATION_TITLE,
-            init_state_name=feconf.DEFAULT_INIT_STATE_NAME,
-            category=feconf.DEFAULT_EXPLORATION_CATEGORY,
-            objective=feconf.DEFAULT_EXPLORATION_OBJECTIVE,
-            language_code=constants.DEFAULT_LANGUAGE_CODE):
+            cls, exploration_id: str,
+            title: str=feconf.DEFAULT_EXPLORATION_TITLE,
+            init_state_name: str=feconf.DEFAULT_INIT_STATE_NAME,
+            category: str=feconf.DEFAULT_EXPLORATION_CATEGORY,
+            objective: str=feconf.DEFAULT_EXPLORATION_OBJECTIVE,
+            language_code: str=constants.DEFAULT_LANGUAGE_CODE
+            ) -> Exploration:
         """Returns a Exploration domain object with default values.
 
         'title', 'init_state_name', 'category', 'objective' if not provided are
@@ -661,9 +666,11 @@ def create_default_exploration(
 
     @classmethod
     def from_dict(
-            cls, exploration_dict,
-            exploration_version=0, exploration_created_on=None,
-            exploration_last_updated=None):
+            cls, exploration_dict: Dict[str, Any],
+            exploration_version: int =0,
+            exploration_created_on: datetime.datetime=None,
+            exploration_last_updated: datetime.datetime=None
+            ) -> Exploration:
         """Return a Exploration domain object from a dict.
 
         Args:
@@ -2327,7 +2334,7 @@ def to_yaml(self):
 
         return python_utils.yaml_from_dict(exp_dict)
 
-    def to_dict(self):
+    def to_dict(self) -> Dict[str, Any]:
         """Returns a copy of the exploration as a dictionary. It includes all
         necessary information to represent the exploration.
 

diff --git a/core/domain/platform_parameter_domain.py b/core/domain/platform_parameter_domain.py
@@ -27,6 +27,8 @@
 from core.constants import constants
 from core.domain import change_domain
 
+from typing import Any, Dict
+
 SERVER_MODES = python_utils.create_enum('dev', 'test', 'prod') # pylint: disable=invalid-name
 FEATURE_STAGES = SERVER_MODES # pylint: disable=invalid-name
 DATA_TYPES = python_utils.create_enum('bool', 'string', 'number') # pylint: disable=invalid-name
@@ -756,7 +758,7 @@ def _validate_feature_flag(self):
                             'production environment.')
 
     @classmethod
-    def from_dict(cls, param_dict):
+    def from_dict(cls, param_dict: Dict[str, Any]):
         """Returns an PlatformParameter object from a dict.
 
         Args:

diff --git a/core/domain/skill_domain.py b/core/domain/skill_domain.py
@@ -28,6 +28,8 @@
 from core.domain import html_validation_service
 from core.domain import state_domain
 
+from typing import Any, Dict, List
+
 # Do not modify the values of these constants. This is to preserve backwards
 # compatibility with previous change dicts.
 SKILL_PROPERTY_DESCRIPTION = 'description'
@@ -288,7 +290,7 @@ def validate(self):
 class Rubric:
     """Domain object describing a skill rubric."""
 
-    def __init__(self, difficulty, explanations):
+    def __init__(self, difficulty: str, explanations: List[str]):
         """Initializes a Rubric domain object.
 
         Args:
@@ -755,7 +757,7 @@ def validate(self):
                 'Expected a value for all_questions_merged when '
                 'superseding_skill_id is set.')
 
-    def to_dict(self):
+    def to_dict(self) -> Dict[str, Any]:
         """Returns a dict representing this Skill domain object.
 
         Returns:
@@ -883,7 +885,9 @@ def from_dict(
         return skill
 
     @classmethod
-    def create_default_skill(cls, skill_id, description, rubrics):
+    def create_default_skill(
+        cls, skill_id: str, description: str, rubrics: List[Rubric]
+        ) -> Skill:
         """Returns a skill domain object with default values. This is for
         the frontend where a default blank skill would be shown to the user
         when the skill is created for the first time.

diff --git a/core/domain/story_domain.py b/core/domain/story_domain.py
@@ -31,6 +31,8 @@
 from core.domain import html_cleaner
 from core.domain import html_validation_service
 
+from typing import Any, Dict
+
 # Do not modify the values of these constants. This is to preserve backwards
 # compatibility with previous change dicts.
 STORY_PROPERTY_TITLE = 'title'
@@ -861,7 +863,7 @@ def has_exploration(self, exp_id):
                 return True
         return False
 
-    def to_dict(self):
+    def to_dict(self) -> Dict[str, Any]:
         """Returns a dict representing this Story domain object.
 
         Returns:
@@ -976,8 +978,9 @@ def from_dict(
 
     @classmethod
     def create_default_story(
-            cls, story_id, title, description, corresponding_topic_id,
-            url_fragment):
+            cls, story_id: str, title: str,
+            description: str, corresponding_topic_id: str,
+            url_fragment: str) -> Story:
         """Returns a story domain object with default values. This is for
         the frontend where a default blank story would be shown to the user
         when the story is created for the first time.

diff --git a/core/domain/topic_domain.py b/core/domain/topic_domain.py
@@ -33,6 +33,8 @@
 from core.domain import subtopic_page_domain
 from core.domain import user_services
 
+from typing import Any, Dict
+
 CMD_CREATE_NEW = feconf.CMD_CREATE_NEW
 CMD_CHANGE_ROLE = feconf.CMD_CHANGE_ROLE
 CMD_REMOVE_MANAGER_ROLE = feconf.CMD_REMOVE_MANAGER_ROLE
@@ -561,7 +563,7 @@ def __init__(
         self.practice_tab_is_displayed = practice_tab_is_displayed
         self.page_title_fragment_for_web = page_title_fragment_for_web
 
-    def to_dict(self):
+    def to_dict(self) -> Dict[str, Any]:
         """Returns a dict representing this Topic domain object.
 
         Returns:
@@ -1132,7 +1134,8 @@ def validate(self, strict=False):
 
     @classmethod
     def create_default_topic(
-            cls, topic_id, name, url_fragment, description):
+            cls, topic_id: str, name: str, url_fragment: str, description: str
+            ) -> Topic:
         """Returns a topic domain object with default values. This is for
         the frontend where a default blank topic would be shown to the user
         when the topic is created for the first time.

diff --git a/core/storage/collection/gae_models_test.py b/core/storage/collection/gae_models_test.py
@@ -59,7 +59,7 @@ def test_get_deletion_policy(self) -> None:
             base_models.DELETION_POLICY.NOT_APPLICABLE)
 
     def test_get_collection_count(self) -> None:
-        collection = collection_domain.Collection.create_default_collection( # type: ignore[no-untyped-call]
+        collection = collection_domain.Collection.create_default_collection(
             'id', title='A title',
             category='A Category', objective='An Objective')
         collection_services.save_new_collection('id', collection) # type: ignore[no-untyped-call]
@@ -69,7 +69,7 @@ def test_get_collection_count(self) -> None:
         self.assertEqual(num_collections, 1)
 
     def test_reconstitute(self) -> None:
-        collection = collection_domain.Collection.create_default_collection( # type: ignore[no-untyped-call]
+        collection = collection_domain.Collection.create_default_collection(
             'id', title='A title',
             category='A Category', objective='An Objective')
         collection_services.save_new_collection('id', collection) # type: ignore[no-untyped-call]

diff --git a/core/storage/exploration/gae_models_test.py b/core/storage/exploration/gae_models_test.py
@@ -58,7 +58,7 @@ def test_get_deletion_policy(self) -> None:
             base_models.DELETION_POLICY.NOT_APPLICABLE)
 
     def test_get_exploration_count(self) -> None:
-        exploration = exp_domain.Exploration.create_default_exploration( # type: ignore[no-untyped-call]
+        exploration = exp_domain.Exploration.create_default_exploration(
             'id', title='A Title',
             category='A Category', objective='An Objective')
         exp_services.save_new_exploration('id', exploration) # type: ignore[no-untyped-call]
@@ -72,7 +72,7 @@ def test_get_exploration_count(self) -> None:
         self.assertEqual(saved_exploration.objective, 'An Objective')
 
     def test_reconstitute(self) -> None:
-        exploration = exp_domain.Exploration.create_default_exploration( # type: ignore[no-untyped-call]
+        exploration = exp_domain.Exploration.create_default_exploration(
             'id', title='A Title',
             category='A Category', objective='An Objective')
         exp_services.save_new_exploration('id', exploration) # type: ignore[no-untyped-call]

diff --git a/core/storage/topic/gae_models_test.py b/core/storage/topic/gae_models_test.py
@@ -101,7 +101,7 @@ def test_that_subsidiary_models_are_created_when_new_model_is_saved(
         )
 
     def test_get_by_name(self) -> None:
-        topic = topic_domain.Topic.create_default_topic( # type: ignore[no-untyped-call]
+        topic = topic_domain.Topic.create_default_topic(
             self.TOPIC_ID, self.TOPIC_NAME, 'name', 'description')
         topic_services.save_new_topic(feconf.SYSTEM_COMMITTER_ID, topic) # type: ignore[no-untyped-call]
         topic_model = topic_models.TopicModel.get_by_name(self.TOPIC_NAME)
@@ -111,7 +111,7 @@ def test_get_by_name(self) -> None:
         self.assertEqual(topic_model.id, self.TOPIC_ID)
 
     def test_get_by_url_fragment(self) -> None:
-        topic = topic_domain.Topic.create_default_topic( # type: ignore[no-untyped-call]
+        topic = topic_domain.Topic.create_default_topic(
             self.TOPIC_ID, self.TOPIC_NAME, 'name-two', 'description')
         topic_services.save_new_topic(feconf.SYSTEM_COMMITTER_ID, topic) # type: ignore[no-untyped-call]
         topic_model = topic_models.TopicModel.get_by_name(self.TOPIC_NAME)

@@ -64,7 +64,6 @@
     'core/domain/blog_services_test.py',
     'core/domain/blog_validators.py',
     'core/domain/blog_validators_test.py',
-    'core/domain/caching_services_test.py',
     'core/domain/calculation_registry.py',
     'core/domain/calculation_registry_test.py',
     'core/domain/change_domain.py',