Merge pull request #689 from FlorentinD/session-user-creator-id

Return tenant and user in session endpoints

Author: soerenreichardt

graphdatascience/session/aura_api_responses.py

@@ -23,6 +23,8 @@ class SessionDetails:
     created_at: datetime
     expiry_date: Optional[datetime]
     ttl: Optional[timedelta]
+    user_id: str
+    tenant_id: str
 
     @classmethod
     def fromJson(cls, json: Dict[str, Any]) -> SessionDetails:
@@ -38,7 +40,9 @@ def fromJson(cls, json: Dict[str, Any]) -> SessionDetails:
             host=json["host"],
             expiry_date=TimeParser.fromisoformat(expiry_date) if expiry_date else None,
             created_at=TimeParser.fromisoformat(json["created_at"]),
-            ttl=Timedelta(ttl).to_pytimedelta() if ttl else None,  # datetime has no support for parsing timedetla
+            ttl=Timedelta(ttl).to_pytimedelta() if ttl else None,  # datetime has no support for parsing timedelta
+            tenant_id=json["tenant_id"],
+            user_id=json["user_id"],
         )
 
     def bolt_connection_url(self) -> str:

graphdatascience/tests/unit/test_aura_api.py

@@ -35,6 +35,8 @@ def test_create_session(requests_mock: Mocker) -> None:
             "created_at": "1970-01-01T00:00:00Z",
             "host": "1.2.3.4",
             "memory": "4Gi",
+            "tenant_id": "tenant-0",
+            "user_id": "user-0",
         },
     )
 
@@ -50,6 +52,8 @@ def test_create_session(requests_mock: Mocker) -> None:
         memory=SessionMemory.m_4GB.value,
         expiry_date=None,
         ttl=None,
+        tenant_id="tenant-0",
+        user_id="user-0",
     )
 
 
@@ -70,6 +74,8 @@ def test_list_session(requests_mock: Mocker) -> None:
             "host": "1.2.3.4",
             "memory": "4Gi",
             "expiry_date": "1977-01-01T00:00:00Z",
+            "tenant_id": "tenant-0",
+            "user_id": "user-0",
         },
     )
 
@@ -85,6 +91,8 @@ def test_list_session(requests_mock: Mocker) -> None:
         memory=SessionMemory.m_4GB.value,
         expiry_date=TimeParser.fromisoformat("1977-01-01T00:00:00Z"),
         ttl=None,
+        tenant_id="tenant-0",
+        user_id="user-0",
     )
 
 
@@ -104,6 +112,8 @@ def test_list_sessions(requests_mock: Mocker) -> None:
                 "host": "1.2.3.4",
                 "memory": "4Gi",
                 "expiry_date": "1977-01-01T00:00:00Z",
+                "tenant_id": "tenant-1",
+                "user_id": "user-1",
             },
             {
                 "id": "id1",
@@ -113,6 +123,8 @@ def test_list_sessions(requests_mock: Mocker) -> None:
                 "created_at": "2012-01-01T00:00:00Z",
                 "memory": "8Gi",
                 "host": "foo.bar",
+                "tenant_id": "tenant-2",
+                "user_id": "user-2",
             },
         ],
     )
@@ -129,6 +141,8 @@ def test_list_sessions(requests_mock: Mocker) -> None:
         memory=SessionMemory.m_4GB.value,
         expiry_date=TimeParser.fromisoformat("1977-01-01T00:00:00Z"),
         ttl=None,
+        tenant_id="tenant-1",
+        user_id="user-1",
     )
 
     expected2 = SessionDetails(
@@ -141,6 +155,8 @@ def test_list_sessions(requests_mock: Mocker) -> None:
         host="foo.bar",
         expiry_date=None,
         ttl=None,
+        tenant_id="tenant-2",
+        user_id="user-2",
     )
 
     assert result == [expected1, expected2]
@@ -203,6 +219,8 @@ def test_dont_wait_forever_for_session(requests_mock: Mocker, caplog: LogCapture
             "host": "foo.bar",
             "memory": "4Gi",
             "expiry_date": "1977-01-01T00:00:00Z",
+            "tenant_id": "tenant-1",
+            "user_id": "user-1",
         },
     )
 
@@ -230,6 +248,8 @@ def test_wait_for_session_running(requests_mock: Mocker) -> None:
             "host": "foo.bar",
             "memory": "4Gi",
             "expiry_date": "1977-01-01T00:00:00Z",
+            "tenant_id": "tenant-1",
+            "user_id": "user-1",
         },
     )
 
@@ -671,6 +691,8 @@ def test_parse_session_info() -> None:
         "created_at": "2021-01-01T00:00:00Z",
         "host": "a.b",
         "ttl": "1d8h1m2s",
+        "tenant_id": "tenant-1",
+        "user_id": "user-1",
     }
     session_info = SessionDetails.fromJson(session_details)
 
@@ -684,6 +706,8 @@ def test_parse_session_info() -> None:
         expiry_date=datetime(2022, 1, 1, 0, 0, 0, tzinfo=timezone.utc),
         created_at=datetime(2021, 1, 1, 0, 0, 0, tzinfo=timezone.utc),
         ttl=timedelta(days=1, hours=8, minutes=1, seconds=2),
+        tenant_id="tenant-1",
+        user_id="user-1",
     )
 
 
@@ -696,6 +720,8 @@ def test_parse_session_info_without_optionals() -> None:
         "status": "running",
         "host": "a.b",
         "created_at": "2021-01-01T00:00:00Z",
+        "tenant_id": "tenant-1",
+        "user_id": "user-1",
     }
     session_info = SessionDetails.fromJson(session_details)
 
@@ -709,4 +735,6 @@ def test_parse_session_info_without_optionals() -> None:
         expiry_date=None,
         ttl=None,
         created_at=datetime(2021, 1, 1, 0, 0, 0, tzinfo=timezone.utc),
+        tenant_id="tenant-1",
+        user_id="user-1",
     )

graphdatascience/tests/unit/test_dedicated_sessions.py

@@ -54,6 +54,8 @@ def create_session(self, name: str, dbid: str, pwd: str, memory: SessionMemoryVa
             host="foo.bar",
             expiry_date=None,
             ttl=None,
+            user_id="user-1",
+            tenant_id=self._tenant_id,
         )
 
         self.id_counter += 1
@@ -302,6 +304,8 @@ def test_get_or_create_expired_session(aura_api: AuraApi) -> None:
             host="foo.bar",
             expiry_date=None,
             ttl=None,
+            tenant_id="tenant-0",
+            user_id="user-0",
         )
     )
 
@@ -327,6 +331,8 @@ def test_get_or_create_soon_expired_session(aura_api: AuraApi) -> None:
             host="foo.bar",
             expiry_date=datetime.now(tz=timezone.utc) - timedelta(hours=23),
             ttl=None,
+            tenant_id="tenant-0",
+            user_id="user-0",
         )
     )
 
@@ -350,6 +356,8 @@ def test_get_or_create_with_different_memory_config(aura_api: AuraApi) -> None:
             host="foo.bar",
             expiry_date=None,
             ttl=None,
+            tenant_id="tenant-0",
+            user_id="user-0",
         )
     )