[ENH] Modify UserInfo Class

docs/references/api.rst

@@ -14,6 +14,9 @@ Market
 .. autoclass:: learnware.market.BaseMarket
  :members:
 
+.. autoclass:: learnware.market.SerialMarket
+ :members:
+
 .. autoclass:: learnware.market.AnchoredMarket
  :members:
 
@@ -23,6 +26,9 @@ Market
 .. autoclass:: learnware.market.BaseUserInfo
  :members:
 
+.. autoclass:: learnware.market.SerialUserInfo
+ :members:
+
 Learnware
 ====================
 
@@ -41,5 +47,5 @@ Specification
 .. autoclass:: learnware.specification.BaseStatSpecification
  :members:
 
-.. autoclass:: learnware.specification.RKMESpecification
+.. autoclass:: learnware.specification.RKMEStatSpecification
  :members:

learnware/learnware/base.py

@@ -8,10 +8,10 @@
 
 
 class Learnware:
- def __init__(self, id: str, name: str, model: Union[BaseModel, dict], specification: Specification, desc: str):
+ def __init__(self, id: str, name: str, model: BaseModel, specification: Specification, desc: str):
  self.id = id
  self.name = name
- self.model = self._import_model(model)
+ self.model = model
  self.specification = specification
  self.desc = desc
 

learnware/market/__init__.py

@@ -1,3 +1,4 @@
 from .base import BaseUserInfo, BaseMarket
 from .anchor import AnchoredUserInfo, AnchoredMarket
 from .evolve import EvolvedMarket
+from .serial import SerialMarket, SerialUserInfo

learnware/market/anchor.py

@@ -2,10 +2,11 @@
 from typing import Tuple, Any, List, Union, Dict
 
 from ..learnware import Learnware
-from .base import BaseUserInfo, BaseMarket
+from .base import BaseMarket
+from .serial import SerialUserInfo
 
 
-class AnchoredUserInfo(BaseUserInfo):
+class AnchoredUserInfo(SerialUserInfo):
  """
  User Information for searching learnware (add the anchor design)
 

learnware/market/base.py

@@ -10,34 +10,11 @@
 class BaseUserInfo:
  """User Information for searching learnware"""
 
- def __init__(self, id: str, semantic_spec: dict = dict(), stat_info: dict = dict()):
- """Initializing user information
-
- Parameters
- ----------
- id : str
- user id
- semantic_spec : dict, optional
- semantic_spec selected by user, by default dict()
- stat_info : dict, optional
- statistical information uploaded by user, by default dict()
- """
- self.id = id
- self.semantic_spec = semantic_spec
- self.stat_info = stat_info
-
  def get_semantic_spec(self) -> dict:
- """Return user semantic specifications
-
- Returns
- -------
- dict
- user semantic specifications
- """
- return self.semantic_spec
+ raise NotImplementedError("get_semantic_spec is Not Implemented")
 
  def get_stat_info(self, name: str):
- return self.stat_info.get(name, None)
+ raise NotImplementedError("get_stat_info is Not Implemented")
 
 
 class BaseMarket:

learnware/market/serial.py

@@ -7,6 +7,35 @@
 from ..learnware import Learnware
 from ..specification import RKMEStatSpecification
 
+class SerialUserInfo(BaseUserInfo):
+ def __init__(self, id: str, semantic_spec: dict = dict(), stat_info: dict = dict()):
+ """Initializing user information
+
+ Parameters
+ ----------
+ id : str
+ user id
+ semantic_spec : dict, optional
+ semantic_spec selected by user, by default dict()
+ stat_info : dict, optional
+ statistical information uploaded by user, by default dict()
+ """
+ self.id = id
+ self.semantic_spec = semantic_spec
+ self.stat_info = stat_info
+
+ def get_semantic_spec(self) -> dict:
+ """Return user semantic specifications
+
+ Returns
+ -------
+ dict
+ user semantic specifications
+ """
+ return self.semantic_spec
+
+ def get_stat_info(self, name: str):
+ return self.stat_info.get(name, None)
 
 class SerialMarket(BaseMarket):
  def __init__(self):

learnware/specification/base.py

@@ -18,7 +18,7 @@ def load(self, filepath: str):
 class Specification:
  def __init__(self, semantic_spec=None):
  self.semantic_spec = semantic_spec
- self.stat_spec = {} # stat_spec should be dict
+ self.stat_spec = BaseStatSpecification() # stat_spec should be dict
 
  def get_stat_spec(self):
  return self.stat_spec

learnware/specification/utils.py

@@ -1,7 +1,7 @@
 import numpy as np
 
 from .base import BaseStatSpecification
-from .rkme import RKMESpecification
+from .rkme import RKMEStatSpecification
 
 
 def generate_rkme_spec(
@@ -13,10 +13,10 @@ def generate_rkme_spec(
  nonnegative_beta: bool = True,
  reduce: bool = True,
  cuda_idx: int = -1,
-) -> RKMESpecification:
+) -> RKMEStatSpecification:
  """
  Interface for users to generate Reduced-set Kernel Mean Embedding (RKME) specification.
- Return a RKMESpecification object, use .save() method to save as json file.
+ Return a RKMEStatSpecification object, use .save() method to save as json file.
 
 
  Parameters
@@ -41,10 +41,10 @@ def generate_rkme_spec(
 
  Returns
  -------
- RKMESpecification
- A RKMESpecification object
+ RKMEStatSpecification
+ A RKMEStatSpecification object
  """
- rkme_spec = RKMESpecification(gamma=gamma, cuda_idx=cuda_idx)
+ rkme_spec = RKMEStatSpecification(gamma=gamma, cuda_idx=cuda_idx)
  rkme_spec.generate_stat_spec_from_data(X, K, step_size, steps, nonnegative_beta, reduce)
  return rkme_spec