Move NodeTypeInfo into the cloud module

Author: milliams

citc/aws.py

@@ -5,8 +5,7 @@
 import boto3
 from mypy_boto3_ec2 import EC2Client
 
-from .cloud import CloudNode, NodeState
-from .utils import NodeTypeInfo
+from .cloud import CloudNode, NodeState, NodeTypeInfo
 
 
 class NodeNotFound(Exception):

citc/cloud.py

@@ -1,5 +1,6 @@
 from abc import ABC, abstractmethod
 from enum import Enum, auto
+from typing import TypedDict, Optional
 
 
 class NodeState(Enum):
@@ -45,3 +46,10 @@ def __init__(self, name, state, ip):
     @abstractmethod
     def all(cls, client, nodespace: dict):
         pass
+
+
+class NodeTypeInfo(TypedDict):
+    memory: int
+    cores_per_socket: int
+    threads_per_core: int
+    arch: Optional[str]

citc/utils.py

@@ -1,4 +1,4 @@
-from typing import Dict, List, TypedDict, Optional
+from typing import Dict, List
 
 import yaml
 
@@ -39,14 +39,7 @@ def get_cloud_nodes() -> List[cloud.CloudNode]:
     return cloud_nodes
 
 
-class NodeTypeInfo(TypedDict):
-    memory: int
-    cores_per_socket: int
-    threads_per_core: int
-    arch: Optional[str]
-
-
-def get_types_info() -> Dict[str, NodeTypeInfo]:
+def get_types_info() -> Dict[str, cloud.NodeTypeInfo]:
     """
     Returns:
         list: a list of node info dictionaries