feat(sdk): Fix for tests for python sdk and environment variables for… (#80)

avinashpipalwa · web-flow · commit 59c18d83b0f2 · 2021-11-19T11:25:09.000+05:30
* feat(sdk): Fix for tests for python sdk and environment variables for examples

Added changes for tests for python sdk.
Fixed the username variables to get the username serial from the environment variables.

* fix(sdk): fixed minor review comments

Removed commented lines.
Changed the assert type.

* fix(sdk): Tests for Python SDK

* feat(sdk): Fix tests for Python SDK
diff --git a/examples/afi_optimizer_example.py b/examples/afi_optimizer_example.py
@@ -17,9 +17,9 @@
 
 from urllib3 import Retry
 
-host = "https://api.factset.com"
-username = "<username-serial>"
-password = "<apiKey>"
+host = os.environ['FACTSET_HOST']
+username = os.environ['FACTSET_USERNAME']
+password = os.environ['FACTSET_API_KEY']
 
 
 def main():
diff --git a/examples/axp_optimizer_example.py b/examples/axp_optimizer_example.py
@@ -19,9 +19,9 @@
 
 from urllib3 import Retry
 
-host = "https://api.factset.com"
-username = "<username-serial>"
-password = "<apiKey>"
+host = os.environ['FACTSET_HOST']
+username = os.environ['FACTSET_USERNAME']
+password = os.environ['FACTSET_API_KEY']
 
 
 def main():
diff --git a/examples/bpm_optimizer_example.py b/examples/bpm_optimizer_example.py
@@ -17,9 +17,9 @@
 
 from urllib3 import Retry
 
-host = "https://api.factset.com"
-username = "<username-serial>"
-password = "<apiKey>"
+host = os.environ['FACTSET_HOST']
+username = os.environ['FACTSET_USERNAME']
+password = os.environ['FACTSET_API_KEY']
 
 
 def main():
diff --git a/examples/fi_example.py b/examples/fi_example.py
@@ -16,9 +16,9 @@
 
 from urllib3 import Retry
 
-host = "https://api.factset.com"
-username = "<username-serial>"
-password = "<apiKey>"
+host = os.environ['FACTSET_HOST']
+username = os.environ['FACTSET_USERNAME']
+password = os.environ['FACTSET_API_KEY']
 
 
 def main():
diff --git a/examples/fpo_optimizer_example.py b/examples/fpo_optimizer_example.py
@@ -20,9 +20,9 @@
 
 from urllib3 import Retry
 
-host = "https://api.factset.com"
-username = "<username-serial>"
-password = "<apiKey>"
+host = os.environ['FACTSET_HOST']
+username = os.environ['FACTSET_USERNAME']
+password = os.environ['FACTSET_API_KEY']
 
 
 def main():
diff --git a/examples/pa_engine_multiple_unit_example.py b/examples/pa_engine_multiple_unit_example.py
@@ -18,10 +18,9 @@
 
 from urllib3 import Retry
 
-host = "https://api.factset.com"
-username = "<username-serial>"
-password = "<apiKey>"
-
+host = os.environ['FACTSET_HOST']
+username = os.environ['FACTSET_USERNAME']
+password = os.environ['FACTSET_API_KEY']
 
 def main():
     config = Configuration()
diff --git a/examples/pa_engine_single_unit_example.py b/examples/pa_engine_single_unit_example.py
@@ -18,9 +18,9 @@
 
 from urllib3 import Retry
 
-host = "https://api.factset.com"
-username = "<username-serial>"
-password = "<apiKey>"
+host = os.environ['FACTSET_HOST']
+username = os.environ['FACTSET_USERNAME']
+password = os.environ['FACTSET_API_KEY']
 
 def main():
     config = Configuration()
diff --git a/examples/pub_engine_multiple_unit_example.py b/examples/pub_engine_multiple_unit_example.py
@@ -13,9 +13,9 @@
 from urllib3 import Retry
 from pathlib import Path
 
-host = "https://api.factset.com"
-username = "<username-serial>"
-password = "<apiKey>"
+host = os.environ['FACTSET_HOST']
+username = os.environ['FACTSET_USERNAME']
+password = os.environ['FACTSET_API_KEY']
 
 
 def main():
diff --git a/examples/pub_engine_single_unit_example.py b/examples/pub_engine_single_unit_example.py
@@ -13,9 +13,9 @@
 
 from urllib3 import Retry
 
-host = "https://api.factset.com"
-username = "<username-serial>"
-password = "<apiKey>"
+host = os.environ['FACTSET_HOST']
+username = os.environ['FACTSET_USERNAME']
+password = os.environ['FACTSET_API_KEY']
 
 
 def main():
diff --git a/examples/quant_engine_single_unit_feather_example_basic.py b/examples/quant_engine_single_unit_feather_example_basic.py
@@ -17,9 +17,9 @@
 
 from urllib3 import Retry
 
-host = "https://api.factset.com"
-username = "<username-serial>"
-password = "<apiKey>"
+host = os.environ['FACTSET_HOST']
+username = os.environ['FACTSET_USERNAME']
+password = os.environ['FACTSET_API_KEY']
 
 
 def main():
diff --git a/examples/quant_engine_single_unit_feather_example_fql_expr_univ_expr.py b/examples/quant_engine_single_unit_feather_example_fql_expr_univ_expr.py
@@ -16,9 +16,9 @@
 
 from urllib3 import Retry
 
-host = "https://api.factset.com"
-username = "<username-serial>"
-password = "<apiKey>"
+host = os.environ['FACTSET_HOST']
+username = os.environ['FACTSET_USERNAME']
+password = os.environ['FACTSET_API_KEY']
 
 
 def main():
diff --git a/examples/quant_engine_single_unit_feather_example_fql_expr_univ_ids.py b/examples/quant_engine_single_unit_feather_example_fql_expr_univ_ids.py
@@ -19,9 +19,9 @@
 
 from urllib3 import Retry
 
-host = "https://api.factset.com"
-username = "<username-serial>"
-password = "<apiKey>"
+host = os.environ['FACTSET_HOST']
+username = os.environ['FACTSET_USERNAME']
+password = os.environ['FACTSET_API_KEY']
 
 
 def main():
diff --git a/examples/quant_engine_single_unit_feather_example_scr_expr_univ_expr.py b/examples/quant_engine_single_unit_feather_example_scr_expr_univ_expr.py
@@ -16,9 +16,9 @@
 
 from urllib3 import Retry
 
-host = "https://api.factset.com"
-username = "<username-serial>"
-password = "<apiKey>"
+host = os.environ['FACTSET_HOST']
+username = os.environ['FACTSET_USERNAME']
+password = os.environ['FACTSET_API_KEY']
 
 
 def main():
diff --git a/examples/quant_engine_single_unit_feather_example_scr_expr_univ_ids.py b/examples/quant_engine_single_unit_feather_example_scr_expr_univ_ids.py
@@ -16,9 +16,9 @@
 
 from urllib3 import Retry
 
-host = "https://api.factset.com"
-username = "<username-serial>"
-password = "<apiKey>"
+host = os.environ['FACTSET_HOST']
+username = os.environ['FACTSET_USERNAME']
+password = os.environ['FACTSET_API_KEY']
 
 
 def main():
diff --git a/examples/quant_engine_single_unit_feather_example_usc_params_all.py b/examples/quant_engine_single_unit_feather_example_usc_params_all.py
@@ -16,9 +16,9 @@
 
 from urllib3 import Retry
 
-host = "https://api.factset.com"
-username = "<username-serial>"
-password = "<apiKey>"
+host = os.environ['FACTSET_HOST']
+username = os.environ['FACTSET_USERNAME']
+password = os.environ['FACTSET_API_KEY']
 
 
 def main():
diff --git a/examples/quant_engine_single_unit_feather_example_usc_params_basic.py b/examples/quant_engine_single_unit_feather_example_usc_params_basic.py
@@ -16,9 +16,9 @@
 
 from urllib3 import Retry
 
-host = "https://api.factset.com"
-username = "<username-serial>"
-password = "<apiKey>"
+host = os.environ['FACTSET_HOST']
+username = os.environ['FACTSET_USERNAME']
+password = os.environ['FACTSET_API_KEY']
 
 
 def main():
diff --git a/examples/quant_engine_single_unit_stach_example.py b/examples/quant_engine_single_unit_stach_example.py
@@ -19,9 +19,9 @@
 
 from urllib3 import Retry
 
-host = "https://api.factset.com"
-username = "<username-serial>"
-password = "<apiKey>"
+host = os.environ['FACTSET_HOST']
+username = os.environ['FACTSET_USERNAME']
+password = os.environ['FACTSET_API_KEY']
 
 
 def main():
diff --git a/examples/quant_engines_single_unit_feather_example_usc_params_all.py b/examples/quant_engines_single_unit_feather_example_usc_params_all.py
@@ -16,9 +16,9 @@
 
 from urllib3 import Retry
 
-host = "https://api.factset.com"
-username = "<username-serial>"
-password = "<apiKey>"
+host = os.environ['FACTSET_HOST']
+username = os.environ['FACTSET_USERNAME']
+password = os.environ['FACTSET_API_KEY']
 
 
 def main():
diff --git a/examples/spar_engine_multiple_unit_example.py b/examples/spar_engine_multiple_unit_example.py
@@ -18,9 +18,9 @@
 
 from urllib3 import Retry
 
-host = "https://api.factset.com"
-username = "<username-serial>"
-password = "<apiKey>"
+host = os.environ['FACTSET_HOST']
+username = os.environ['FACTSET_USERNAME']
+password = os.environ['FACTSET_API_KEY']
 
 
 def main():
diff --git a/examples/spar_engine_single_unit_example.py b/examples/spar_engine_single_unit_example.py
@@ -18,9 +18,9 @@
 
 from urllib3 import Retry
 
-host = "https://api.factset.com"
-username = "<username-serial>"
-password = "<apiKey>"
+host = os.environ['FACTSET_HOST']
+username = os.environ['FACTSET_USERNAME']
+password = os.environ['FACTSET_API_KEY']
 
 
 def main():
diff --git a/examples/vault_engine_multiple_unit_example.py b/examples/vault_engine_multiple_unit_example.py
@@ -19,9 +19,9 @@
 
 from urllib3 import Retry
 
-host = "https://api.factset.com"
-username = "<username-serial>"
-password = "<apiKey>"
+host = os.environ['FACTSET_HOST']
+username = os.environ['FACTSET_USERNAME']
+password = os.environ['FACTSET_API_KEY']
 
 
 def main():
diff --git a/examples/vault_engine_single_unit_example.py b/examples/vault_engine_single_unit_example.py
@@ -19,9 +19,9 @@
 
 from urllib3 import Retry
 
-host = "https://api.factset.com"
-username = "<username-serial>
-password = "<apiKey>"
+host = os.environ['FACTSET_HOST']
+username = os.environ['FACTSET_USERNAME']
+password = os.environ['FACTSET_API_KEY']
 
 
 def main():
diff --git a/tests/test_linked_pa_templates.py b/tests/test_linked_pa_templates.py
@@ -5,6 +5,7 @@
 from fds.analyticsapi.engines.model.linked_pa_template_parameters import LinkedPATemplateParameters
 from fds.analyticsapi.engines.model.template_content_types import TemplateContentTypes
 from fds.analyticsapi.engines.model.linked_pa_template_summary import LinkedPATemplateSummary
+from fds.analyticsapi.engines.model.linked_pa_template_post_summary import LinkedPATemplatePostSummary
 from fds.analyticsapi.engines.model.linked_pa_template_update_parameters import LinkedPATemplateUpdateParameters
 from fds.analyticsapi.engines.model.linked_pa_template_update_parameters_root import LinkedPATemplateUpdateParametersRoot
 from fds.analyticsapi.engines.model.linked_pa_template_root import LinkedPATemplateRoot
@@ -36,13 +37,11 @@ def test_a_create_linked_pa_template(self):
 
         response = self.linked_pa_templates_api.create_linked_pa_templates(
             linked_pa_template_parameters_root = linked_pa_template_parameters_root)
-
-        firsttemplate = list(response[0].data.keys())[0]
+        firsttemplate = response[0].data['id']
         self.assertEqual(response[1], 201, "Response should be 201 - Success")
-        self.assertEqual(type(response[0].data), dict, "Response should be of Dictionary type.")
-        self.assertEqual(type(response[0].data[firsttemplate]),
-            LinkedPATemplateSummary, "Response should be of LinkedPATemplateSummary type.")
-        self.assertGreater(len(response[0].data), 0, "Response result should not be an empty list.")
+        self.assertEqual(type(response[0].data), LinkedPATemplatePostSummary, "Response should be of LinkedPATemplatePostSummary type.")
+        self.assertEqual(type(response[0].data['id']), str, "Response should be of String type.")
+        self.assertGreater(len(response[0].data['id']), 0, "Response result should not be an empty list.")
 
     def test_b_get_all_linked_pa_templates(self):
         response = self.linked_pa_templates_api.get_linked_pa_templates(
@@ -77,12 +76,9 @@ def test_c_update_linked_pa_template(self):
         response = self.linked_pa_templates_api.update_linked_pa_templates(
             id = template_id, linked_pa_template_update_parameters_root=linked_pa_template_update_parameters_root
         )
-
         self.assertEqual(response[1], 200, "Response should be 200 - Success")
-        self.assertEqual(type(response[0].data), dict, "Response should be of Dictionary type.")
-        self.assertEqual(type(response[0].data[template_id]),
-            LinkedPATemplateSummary, "Response should be of LinkedPATemplateSummary type.")
-        self.assertGreater(len(response[0].data), 0, "Response result should not be an empty list.")
+        self.assertEqual(type(response[0].data), LinkedPATemplatePostSummary, "Response should be of LinkedPATemplatePostSummary type.")
+        self.assertGreater(len(response[0].data['id']), 0, "Response result should not be an empty list.")
 
     def test_d_get_linked_pa_template_by_id(self):
         templates = self.linked_pa_templates_api.get_linked_pa_templates(
@@ -103,8 +99,8 @@ def test_e_delete_linked_pa_template(self):
         templates = self.linked_pa_templates_api.get_linked_pa_templates(
             directory = "Personal:SDKTests/DoNotModify/LinkedPATemplates/"
         )
+        
         template_id = list(templates[0].data.keys())[0]
-
         response = self.linked_pa_templates_api.delete_linked_pa_templates(
             id = template_id
         )
diff --git a/tests/test_pa_calculations_api.py b/tests/test_pa_calculations_api.py
@@ -30,9 +30,9 @@ def create_calculation(test_context):
                 document="PA_DOCUMENTS:DEFAULT",
                 _return_http_data_only=True)
             component_summary = ComponentSummary(
-                name="Weights", category="Weights / Exposures", type="PA component")
+                name="Weights", category="Weights / Exposures")
             component_id = [id for id in list(
-                components.data.keys()) if components.data[id] == component_summary][0]
+                components.data.keys()) if components.data[id].name == component_summary.name and components.data[id].category == component_summary.category][0]
             pa_accounts = [PAIdentifier(id="BENCH:SP50")]
             pa_benchmarks = [PAIdentifier(id="BENCH:R.1000")]
             pa_dates = PADateParameters(
diff --git a/tests/test_templated_pa_components.py b/tests/test_templated_pa_components.py
diff --git a/tests/test_unlinked_pa_templates.py b/tests/test_unlinked_pa_templates.py
