Skip to content

Commit

Permalink
renamed repositories to stores
Browse files Browse the repository at this point in the history
  • Loading branch information
niklastheman committed Feb 26, 2024
1 parent 1338055 commit ecc2a27
Show file tree
Hide file tree
Showing 19 changed files with 42 additions and 49 deletions.
7 changes: 3 additions & 4 deletions fedn/fedn/network/api/v1/client_routes.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@

from flask import Blueprint, jsonify, request

from fedn.network.storage.statestore.repositories.client_repository import \
ClientRepository
from fedn.network.storage.statestore.repositories.shared import EntityNotFound
from fedn.network.storage.statestore.stores.client_store import ClientStore
from fedn.network.storage.statestore.stores.shared import EntityNotFound

from .shared import (api_version, get_post_data_to_kwargs,
get_typed_list_headers, mdb)

bp = Blueprint("client", __name__, url_prefix=f"/api/{api_version}/clients")

client_repository = ClientRepository(mdb, "network.clients")
client_repository = ClientStore(mdb, "network.clients")


@bp.route("/", methods=["GET"])
Expand Down
7 changes: 3 additions & 4 deletions fedn/fedn/network/api/v1/combiner_routes.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
from flask import Blueprint, jsonify, request

from fedn.network.storage.statestore.repositories.combiner_repository import \
CombinerRepository
from fedn.network.storage.statestore.repositories.shared import EntityNotFound
from fedn.network.storage.statestore.stores.combiner_store import CombinerStore
from fedn.network.storage.statestore.stores.shared import EntityNotFound

from .shared import (api_version, get_post_data_to_kwargs,
get_typed_list_headers, mdb)

bp = Blueprint("combiner", __name__, url_prefix=f"/api/{api_version}/combiners")

combiner_repository = CombinerRepository(mdb, "network.combiners")
combiner_repository = CombinerStore(mdb, "network.combiners")


@bp.route("/", methods=["GET"])
Expand Down
7 changes: 3 additions & 4 deletions fedn/fedn/network/api/v1/model_routes.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@

from flask import Blueprint, jsonify, request

from fedn.network.storage.statestore.repositories.model_repository import \
ModelRepository
from fedn.network.storage.statestore.repositories.shared import EntityNotFound
from fedn.network.storage.statestore.stores.model_store import ModelStore
from fedn.network.storage.statestore.stores.shared import EntityNotFound

from .shared import (api_version, get_limit, get_post_data_to_kwargs,
get_typed_list_headers, mdb)

bp = Blueprint("model", __name__, url_prefix=f"/api/{api_version}/models")

model_repository = ModelRepository(mdb, "control.model")
model_repository = ModelStore(mdb, "control.model")


@bp.route("/", methods=["GET"])
Expand Down
7 changes: 3 additions & 4 deletions fedn/fedn/network/api/v1/package_routes.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
from flask import Blueprint, jsonify, request

from fedn.network.storage.statestore.repositories.package_repository import \
PackageRepository
from fedn.network.storage.statestore.repositories.shared import EntityNotFound
from fedn.network.storage.statestore.stores.package_store import PackageStore
from fedn.network.storage.statestore.stores.shared import EntityNotFound

from .shared import (api_version, get_post_data_to_kwargs,
get_typed_list_headers, get_use_typing, mdb)

bp = Blueprint("package", __name__, url_prefix=f"/api/{api_version}/packages")

package_repository = PackageRepository(mdb, "control.package")
package_repository = PackageStore(mdb, "control.package")


@bp.route("/", methods=["GET"])
Expand Down
7 changes: 3 additions & 4 deletions fedn/fedn/network/api/v1/round_routes.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
from flask import Blueprint, jsonify, request

from fedn.network.storage.statestore.repositories.round_repository import \
RoundRepository
from fedn.network.storage.statestore.repositories.shared import EntityNotFound
from fedn.network.storage.statestore.stores.round_store import RoundStore
from fedn.network.storage.statestore.stores.shared import EntityNotFound

from .shared import (api_version, get_post_data_to_kwargs,
get_typed_list_headers, mdb)

bp = Blueprint("round", __name__, url_prefix=f"/api/{api_version}/rounds")

round_repository = RoundRepository(mdb, "control.rounds")
round_repository = RoundStore(mdb, "control.rounds")


@bp.route("/", methods=["GET"])
Expand Down
7 changes: 3 additions & 4 deletions fedn/fedn/network/api/v1/session_routes.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
from flask import Blueprint, jsonify, request

from fedn.network.storage.statestore.repositories.session_repository import \
SessionRepository
from fedn.network.storage.statestore.repositories.shared import EntityNotFound
from fedn.network.storage.statestore.stores.session_store import SessionStore
from fedn.network.storage.statestore.stores.shared import EntityNotFound

from .shared import (api_version, get_post_data_to_kwargs,
get_typed_list_headers, mdb)

bp = Blueprint("session", __name__, url_prefix=f"/api/{api_version}/sessions")

session_repository = SessionRepository(mdb, "control.sessions")
session_repository = SessionStore(mdb, "control.sessions")


@bp.route("/", methods=["GET"])
Expand Down
7 changes: 3 additions & 4 deletions fedn/fedn/network/api/v1/status_routes.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
from flask import Blueprint, jsonify, request

from fedn.network.storage.statestore.repositories.shared import EntityNotFound
from fedn.network.storage.statestore.repositories.status_repository import \
StatusRepository
from fedn.network.storage.statestore.stores.shared import EntityNotFound
from fedn.network.storage.statestore.stores.status_store import StatusStore

from .shared import (api_version, get_post_data_to_kwargs,
get_typed_list_headers, get_use_typing, mdb)

bp = Blueprint("status", __name__, url_prefix=f"/api/{api_version}/statuses")

status_repository = StatusRepository(mdb, "control.status")
status_repository = StatusStore(mdb, "control.status")


@bp.route("/", methods=["GET"])
Expand Down
8 changes: 4 additions & 4 deletions fedn/fedn/network/api/v1/validation_routes.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
from flask import Blueprint, jsonify, request

from fedn.network.storage.statestore.repositories.shared import EntityNotFound
from fedn.network.storage.statestore.repositories.validation_repository import \
ValidationRepository
from fedn.network.storage.statestore.stores.shared import EntityNotFound
from fedn.network.storage.statestore.stores.validation_store import \
ValidationStore

from .shared import (api_version, get_post_data_to_kwargs,
get_typed_list_headers, get_use_typing, mdb)

bp = Blueprint("validation", __name__, url_prefix=f"/api/{api_version}/validations")

validation_repository = ValidationRepository(mdb, "control.validations")
validation_repository = ValidationStore(mdb, "control.validations")


@bp.route("/", methods=["GET"])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import pymongo
from pymongo.database import Database

from fedn.network.storage.statestore.repositories.repository import Repository
from fedn.network.storage.statestore.stores.store import Store


class Client:
Expand All @@ -31,7 +31,7 @@ def from_dict(data: dict) -> 'Client':
)


class ClientRepository(Repository[Client]):
class ClientStore(Store[Client]):
def __init__(self, database: Database, collection: str):
super().__init__(database, collection)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from bson import ObjectId
from pymongo.database import Database

from fedn.network.storage.statestore.repositories.repository import Repository
from fedn.network.storage.statestore.stores.store import Store

from .shared import EntityNotFound, from_document

Expand Down Expand Up @@ -55,7 +55,7 @@ def from_dict(data: dict) -> 'Combiner':
)


class CombinerRepository(Repository[Combiner]):
class CombinerStore(Store[Combiner]):
def __init__(self, database: Database, collection: str):
super().__init__(database, collection)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from bson import ObjectId
from pymongo.database import Database

from fedn.network.storage.statestore.repositories.repository import Repository
from fedn.network.storage.statestore.stores.store import Store

from .shared import EntityNotFound, from_document

Expand All @@ -30,7 +30,7 @@ def from_dict(data: dict) -> 'Model':
)


class ModelRepository(Repository[Model]):
class ModelStore(Store[Model]):
def __init__(self, database: Database, collection: str):
super().__init__(database, collection)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import pymongo
from pymongo.database import Database

from fedn.network.storage.statestore.repositories.repository import Repository
from fedn.network.storage.statestore.stores.store import Store

from .shared import EntityNotFound, from_document

Expand Down Expand Up @@ -51,7 +51,7 @@ def from_dict(data: dict, active_package: dict) -> 'Package':
)


class PackageRepository(Repository[Package]):
class PackageStore(Store[Package]):
def __init__(self, database: Database, collection: str):
super().__init__(database, collection)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import pymongo
from pymongo.database import Database

from fedn.network.storage.statestore.repositories.repository import Repository
from fedn.network.storage.statestore.stores.store import Store


class Round:
Expand All @@ -26,7 +26,7 @@ def from_dict(data: dict) -> 'Round':
)


class RoundRepository(Repository[Round]):
class RoundStore(Store[Round]):
def __init__(self, database: Database, collection: str):
super().__init__(database, collection)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from bson import ObjectId
from pymongo.database import Database

from fedn.network.storage.statestore.repositories.repository import Repository
from fedn.network.storage.statestore.stores.store import Store

from .shared import EntityNotFound, from_document

Expand All @@ -25,7 +25,7 @@ def from_dict(data: dict) -> 'Session':
)


class SessionRepository(Repository[Session]):
class SessionStore(Store[Session]):
def __init__(self, database: Database, collection: str):
super().__init__(database, collection)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import pymongo
from pymongo.database import Database

from fedn.network.storage.statestore.repositories.repository import Repository
from fedn.network.storage.statestore.stores.store import Store


class Status:
Expand Down Expand Up @@ -46,7 +46,7 @@ def from_dict(data: dict) -> 'Status':
)


class StatusRepository(Repository[Status]):
class StatusStore(Store[Status]):
def __init__(self, database: Database, collection: str):
super().__init__(database, collection)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
T = TypeVar('T')


class Repository(Generic[T]):
class Store(Generic[T]):
def __init__(self, database: Database, collection: str):
self.database = database
self.collection = collection
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import pymongo
from pymongo.database import Database

from fedn.network.storage.statestore.repositories.repository import Repository
from fedn.network.storage.statestore.stores.store import Store


class Validation:
Expand Down Expand Up @@ -43,7 +43,7 @@ def from_dict(data: dict) -> 'Validation':
)


class ValidationRepository(Repository[Validation]):
class ValidationStore(Store[Validation]):
def __init__(self, database: Database, collection: str):
super().__init__(database, collection)

Expand Down

0 comments on commit ecc2a27

Please sign in to comment.