polly-python 3.1.0__tar.gz → 3.2.0__tar.gz

{polly_python-3.1.0/polly_python.egg-info → polly_python-3.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: polly_python
-Version: 3.1.0
+Version: 3.2.0
 Summary: Polly SDK
 Home-page: https://github.com/ElucidataInc/polly-python
 Project-URL: Documentation, https://docs.elucidata.io
@@ -31,6 +31,7 @@ Provides-Extra: testing
 Requires-Dist: black; extra == "testing"
 Requires-Dist: flake8; extra == "testing"
 Requires-Dist: pytest; extra == "testing"
+Dynamic: license-file
 
 [![made-with-python](https://img.shields.io/badge/Made%20with-Python-1f425f.svg)](https://www.python.org/)
 ![code-coverage](https://github.com/ElucidataInc/polly-python-code/blob/badges_do_not_delete/badges/badge.svg)
@@ -72,5 +73,5 @@ pip install polly-python
 If you have questions, suggestions or problems, feel free to open an issue [here](https://github.com/ElucidataInc/polly-python/issues).
 
 You can contact us at:
-* sabu.george@elucidata.io
-* yogesh.lakhotia@elucidata.io
+* kapil.kumar@elucidata.io
+* jainik.dedhia@elucidata.io

{polly_python-3.1.0 → polly_python-3.2.0}/README.md

@@ -38,5 +38,5 @@ pip install polly-python
 If you have questions, suggestions or problems, feel free to open an issue [here](https://github.com/ElucidataInc/polly-python/issues).
 
 You can contact us at:
-* sabu.george@elucidata.io
-* yogesh.lakhotia@elucidata.io
+* kapil.kumar@elucidata.io
+* jainik.dedhia@elucidata.io

polly_python-3.2.0/polly/__init__.py

@@ -0,0 +1 @@
+__version__ = "3.2.0"

{polly_python-3.1.0 → polly_python-3.2.0}/polly/errors.py

@@ -281,12 +281,13 @@ class DatatypeNotFoundException(Exception):
 
 
 def error_handler(response):
-    if has_error_message(response):
-        title, detail = extract_json_api_error(response)
+    is_error, jsonResponse = has_error_message(response)
+    if is_error:
+        title, detail = extract_json_api_error(jsonResponse)
         if title == app_err_info.REPOSITORY_LOCKED:
             detail = app_err_info.REPOSITORY_LOCKED_DETAIL
         raise RequestException(title, detail)
-    elif response.status_code == 401:
+    elif jsonResponse.status_code == 401:
         raise UnauthorizedException
 
     response.raise_for_status()
@@ -296,16 +297,19 @@ def has_error_message(response):
     try:
         for key in response.json().keys():
             if key in {"error", "errors"}:
-                return True
-        return False
+                return True, response.json()
+        for key in response.json()["data"].keys():
+            if key in {"error", "errors"}:
+                return True, response.json()["data"]
+        return False, response
     except Exception:
-        return False
+        return False, response
 
 
 def extract_json_api_error(response):
-    error = response.json().get("error")
+    error = response.get("error")
     if error is None:
-        error = response.json().get("errors")[0]
+        error = response.get("errors")[0]
     if "title" in error:
         title = error.get("title")
     if "detail" in error:

{polly_python-3.1.0 → polly_python-3.2.0}/polly/polly_kg.py

@@ -44,7 +44,7 @@ class PollyKG:
         )
         self.session = Polly.get_session(token, env=env)
         self.polly_kg_endpoint = (
-            f"https://apis.{self.session.env}.elucidata.io/polly-kg"
+            f"https://sarovar.{self.session.env}.elucidata.io/polly_kg"
         )
         if self.session.env == "polly":
             self.env_string = "prod"
@@ -72,9 +72,9 @@ class PollyKG:
         """
         try:
             response = self.session.get(f"{self.polly_kg_endpoint}/status")
-            response.raise_for_status()
-            print(response.json())
-            return response.json()
+            error_handler(response)
+            print(response.json().get("data"))
+            return response.json().get("data")
         except requests.exceptions.HTTPError as http_err:
             if http_err.response.status_code == 404:
                 raise ResourceNotFoundError("Graph not found.")
@@ -106,8 +106,8 @@ class PollyKG:
         try:
             response = self.session.get(f"{self.polly_kg_endpoint}/summary")
             error_handler(response)
-            print(response.json())
-            return response.json()
+            print(response.json().get("data"))
+            return response.json().get("data")
         except requests.exceptions.HTTPError as http_err:
             if http_err.response.status_code == 404:
                 raise ResourceNotFoundError("Graph summary not found.")
@@ -142,14 +142,16 @@ class PollyKG:
         if not query or query == "":
             raise InvalidParameterException("query")
 
-        payload = {"query_content": query}
+        payload = {
+            "data": {"type": "opencypher", "attributes": {"query_content": query}}
+        }
 
         try:
             response = self.session.post(
-                f"{self.polly_kg_endpoint}/opencypher/query", data=json.dumps(payload)
+                f"{self.polly_kg_endpoint}/opencypher/query/", data=json.dumps(payload)
             )
             error_handler(response)
-            return response.json()["results"]
+            return response.json()["data"]["results"]
         except requests.exceptions.HTTPError as http_err:
             if (
                 http_err.response.status_code == 408
@@ -188,14 +190,14 @@ class PollyKG:
         if not query or query == "":
             raise InvalidParameterException("query")
 
-        payload = {"query_content": query}
+        payload = {"data": {"type": "gremlin", "attributes": {"query_content": query}}}
 
         try:
             response = self.session.post(
-                f"{self.polly_kg_endpoint}/gremlin/query", data=json.dumps(payload)
+                f"{self.polly_kg_endpoint}/gremlin/query/", data=json.dumps(payload)
             )
             error_handler(response)
-            return response.json()["result"]
+            return response.json()["data"]["result"]
         except requests.exceptions.HTTPError as http_err:
             if (
                 http_err.response.status_code == 408

{polly_python-3.1.0 → polly_python-3.2.0/polly_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: polly_python
-Version: 3.1.0
+Version: 3.2.0
 Summary: Polly SDK
 Home-page: https://github.com/ElucidataInc/polly-python
 Project-URL: Documentation, https://docs.elucidata.io
@@ -31,6 +31,7 @@ Provides-Extra: testing
 Requires-Dist: black; extra == "testing"
 Requires-Dist: flake8; extra == "testing"
 Requires-Dist: pytest; extra == "testing"
+Dynamic: license-file
 
 [![made-with-python](https://img.shields.io/badge/Made%20with-Python-1f425f.svg)](https://www.python.org/)
 ![code-coverage](https://github.com/ElucidataInc/polly-python-code/blob/badges_do_not_delete/badges/badge.svg)
@@ -72,5 +73,5 @@ pip install polly-python
 If you have questions, suggestions or problems, feel free to open an issue [here](https://github.com/ElucidataInc/polly-python/issues).
 
 You can contact us at:
-* sabu.george@elucidata.io
-* yogesh.lakhotia@elucidata.io
+* kapil.kumar@elucidata.io
+* jainik.dedhia@elucidata.io

{polly_python-3.1.0 → polly_python-3.2.0}/tests/test_kg.py

@@ -2,28 +2,27 @@
 from polly.polly_kg import PollyKG
 import pytest
 
-# import os
+import os
 from polly.errors import InvalidParameterException, RequestException
 
-# import polly
-import test_constants as test_const
-
 key = "POLLY_API_KEY"
-token = "Zjc2ZGM2YmVjNzo6ZmY2OTk0ZGVhZWQ3YWE3ZGU2OTExMTZlYTE0ZDgxMGVkZGEzYmNlZA=="
-response_json = test_const.WORKSPACE_RESPONSE_JSON
+token = os.getenv(key)
+
+test_key = "TEST_POLLY_API_KEY"
+testpolly_token = os.getenv(test_key)
 
 
 def test_obj_initialised():
-    assert PollyKG(token, env="testpolly") is not None
+    assert PollyKG(testpolly_token, env="testpolly") is not None
 
 
 def test_get_engine_status():
-    obj = PollyKG(token, env="testpolly")
+    obj = PollyKG(testpolly_token, env="testpolly")
     assert dict(obj.get_engine_status()) is not None
 
 
 def test_get_graph_summary():
-    obj = PollyKG(token, env="testpolly")
+    obj = PollyKG(testpolly_token, env="testpolly")
     response = obj.get_graph_summary()
 
     assert response is not None
@@ -35,53 +34,55 @@ def test_get_graph_summary():
 def test_run_gremlin_query_success(mocker):
     # Mocked response from API
     mocked_response = {
-        "requestId": "ab81155d-9f64-4717-a1e3-4e70bf5e6dff",
-        "status": {
-            "message": "",
-            "code": 200,
-            "attributes": {"@type": "g:Map", "@value": []},
-        },
-        "result": {
-            "data": {
-                "@type": "g:List",
-                "@value": [
-                    {
-                        "@type": "g:Map",
-                        "@value": [
-                            "id",
-                            "9796",
-                            "properties",
-                            {
-                                "@type": "g:Map",
-                                "@value": [
-                                    "name",
-                                    {"@type": "g:List", "@value": ["PHYHIP"]},
-                                ],
-                            },
-                        ],
-                    },
-                    {
-                        "@type": "g:Map",
-                        "@value": [
-                            "id",
-                            "5297",
-                            "properties",
-                            {
-                                "@type": "g:Map",
-                                "@value": [
-                                    "name",
-                                    {"@type": "g:List", "@value": ["PI4KA"]},
-                                ],
-                            },
-                        ],
-                    },
-                ],
+        "data": {
+            "requestId": "ab81155d-9f64-4717-a1e3-4e70bf5e6dff",
+            "status": {
+                "message": "",
+                "code": 200,
+                "attributes": {"@type": "g:Map", "@value": []},
             },
-            "meta": {"@type": "g:Map", "@value": []},
-        },
+            "result": {
+                "data": {
+                    "@type": "g:List",
+                    "@value": [
+                        {
+                            "@type": "g:Map",
+                            "@value": [
+                                "id",
+                                "9796",
+                                "properties",
+                                {
+                                    "@type": "g:Map",
+                                    "@value": [
+                                        "name",
+                                        {"@type": "g:List", "@value": ["PHYHIP"]},
+                                    ],
+                                },
+                            ],
+                        },
+                        {
+                            "@type": "g:Map",
+                            "@value": [
+                                "id",
+                                "5297",
+                                "properties",
+                                {
+                                    "@type": "g:Map",
+                                    "@value": [
+                                        "name",
+                                        {"@type": "g:List", "@value": ["PI4KA"]},
+                                    ],
+                                },
+                            ],
+                        },
+                    ],
+                },
+                "meta": {"@type": "g:Map", "@value": []},
+            },
+        }
     }
 
-    obj = PollyKG(token, env="testpolly")
+    obj = PollyKG(testpolly_token, env="testpolly")
 
     # Test invalid query (empty query should raise an exception)
     with pytest.raises(
@@ -149,32 +150,34 @@ def test_run_gremlin_query_success(mocker):
 def test_run_opencypher_query_success(mocker):
     # Mocked response from API
     mocked_response = {
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "transfer-encoding": "chunked",
-                "content-type": "application/json;charset=UTF-8",
+        "data": {
+            "ResponseMetadata": {
+                "HTTPStatusCode": 200,
+                "HTTPHeaders": {
+                    "transfer-encoding": "chunked",
+                    "content-type": "application/json;charset=UTF-8",
+                },
+                "RetryAttempts": 0,
             },
-            "RetryAttempts": 0,
-        },
-        "results": [
-            {
-                "node": {
-                    "~id": "5555",
-                    "~entityType": "node",
-                    "~labels": ["Gene"],
-                    "~properties": {
-                        "EnsemblGeneID": "EEEEEEEEEEEEEEEE",
-                        "Symbol": "PPPPPPPPP",
-                        "LocusTag": "-",
-                        "Synonyms": "CCCCCCCCC",
-                    },
+            "results": [
+                {
+                    "node": {
+                        "~id": "5555",
+                        "~entityType": "node",
+                        "~labels": ["Gene"],
+                        "~properties": {
+                            "EnsemblGeneID": "EEEEEEEEEEEEEEEE",
+                            "Symbol": "PPPPPPPPP",
+                            "LocusTag": "-",
+                            "Synonyms": "CCCCCCCCC",
+                        },
+                    }
                 }
-            }
-        ],
+            ],
+        }
     }
 
-    obj = PollyKG(token, env="testpolly")
+    obj = PollyKG(testpolly_token, env="testpolly")
 
     # Test invalid query (empty query should raise an exception)
     with pytest.raises(
@@ -196,6 +199,6 @@ def test_run_opencypher_query_success(mocker):
     result = obj.run_opencypher_query(query)
 
     # Expected result from mocked response
-    expected_result = mocked_response["results"]
+    expected_result = mocked_response["data"]["results"]
 
     assert result == expected_result

polly_python-3.1.0/polly/__init__.py

@@ -1 +0,0 @@
-__version__ = "3.1.0"