chore: move validation.py into api directory properly (#448)

Author: Opeyem1a

api/ai/interfaces/team_generation_options.py

@@ -4,7 +4,7 @@
 from schema import Schema
 
 from api.dataclasses.team import TeamShell
-from utils.validation import is_unique
+from api.utils.validation import is_unique
 
 
 @dataclass

api/api/validators/evaluate_team_set_validator.py

@@ -5,7 +5,7 @@
 from api.api.validators.interface import Validator
 from api.dataclasses.enums import RequirementOperator, Relationship
 from api.api.utils.relationship import get_relationship_str
-from utils.validation import is_unique
+from api.utils.validation import is_unique
 
 
 class EvaluateTeamSetValidator(Validator):

api/utils/validation.py

@@ -0,0 +1,24 @@
+from typing import Any, List
+
+
+def is_unique(items: List[Any], attr: str = None) -> bool:
+    """
+    Checks if a list of anything contains unique elements (within the list).
+    If attr is given, checks if they each have unique 'attr', where attr is an attribute of item's type.
+
+    NOTE: Assumes that if attr is given, all dicts/objects in items have that 'attr' defined.
+    """
+    types_of_items = set([type(item) for item in items])
+    if len(types_of_items) > 1:
+        raise ValueError("All items should be of the same type.")
+
+    if not attr:
+        return len(set(items)) == len(items)
+
+    # cast back to list to access by index
+    if list(types_of_items)[0] == dict:
+        item_attrs = [item[attr] for item in items if item[attr]]
+    else:
+        item_attrs = [getattr(item, attr) for item in items if getattr(item, attr)]
+
+    return len(set(item_attrs)) == len(item_attrs)

benchmarking/data/simulated_data/mock_initial_teams_provider.py

@@ -4,8 +4,8 @@
 
 from benchmarking.data.interfaces import InitialTeamsProvider
 from api.dataclasses.project import Project
-from api.dataclasses.team import Team, TeamShell
-from utils.validation import is_unique
+from api.dataclasses.team import TeamShell
+from api.utils.validation import is_unique
 
 
 @dataclass

benchmarking/data/simulated_data/mock_student_provider.py

@@ -2,19 +2,20 @@
 import random
 from abc import ABC, abstractmethod
 from dataclasses import dataclass, field
-from typing import Literal, List, Dict, Optional
+from typing import Literal, List, Dict
 
 import numpy as np
 from numpy.random import Generator
 
-from api.dataclasses.enums import Relationship, AttributeValueEnum, ScenarioAttribute
+from api.dataclasses.enums import Relationship, AttributeValueEnum
 from api.dataclasses.student import Student
 from benchmarking.data.interfaces import (
     StudentProvider,
     AttributeRangeConfig,
     NumValuesConfig,
 )
-from utils.validation import is_non_negative_integer, is_unique
+from utils.validation import is_non_negative_integer
+from api.utils.validation import is_unique
 
 
 @dataclass

benchmarking/simulation/insight.py

@@ -1,12 +1,10 @@
 import statistics
 from typing import List, Dict
 
-from api.dataclasses.enums import AlgorithmType
 from api.dataclasses.team_set import TeamSet
 from benchmarking.evaluations.interfaces import TeamSetMetric
-from benchmarking.simulation.basic_simulation_set import BasicSimulationSetArtifact
 from benchmarking.simulation.simulation_set import SimulationSetArtifact
-from utils.validation import is_unique
+from api.utils.validation import is_unique
 
 InsightOutput = Dict[str, List[float]]
 

benchmarking/simulation/simulation_set.py

@@ -7,7 +7,7 @@
 from api.dataclasses.enums import AlgorithmType
 from benchmarking.simulation.simulation import SimulationArtifact, Simulation
 from benchmarking.simulation.simulation_settings import SimulationSettings
-from utils.validation import is_unique
+from api.utils.validation import is_unique
 
 SimulationSetArtifact = Dict[str, SimulationArtifact]
 

tests/test_api/test_ai/test_interfaces/test_algorithm.py

@@ -3,7 +3,7 @@
 from api.ai.interfaces.algorithm import Algorithm
 from api.ai.interfaces.team_generation_options import TeamGenerationOptions
 from api.dataclasses.team import TeamShell
-from utils.validation import is_unique
+from api.utils.validation import is_unique
 
 
 class TestAlgorithm(unittest.TestCase):

tests/test_benchmarking/test_data/test_simulated_data/test_mock_student_provider.py

@@ -15,7 +15,7 @@
     ProbabilisticAttributeValuesMaker,
     ExactAttributeRatiosMaker,
 )
-from utils.validation import is_unique
+from api.utils.validation import is_unique
 
 
 class TestMockStudentProvider(unittest.TestCase):

tests/test_benchmarking/test_simulation/test_basic_simulation_set.py

@@ -8,7 +8,7 @@
 from benchmarking.simulation.basic_simulation_set import BasicSimulationSet
 from benchmarking.simulation.simulation_settings import SimulationSettings
 from tests.test_benchmarking.test_simulation._data import TestScenario
-from utils.validation import is_unique
+from api.utils.validation import is_unique
 
 
 class TestBasicSimulationSet(unittest.TestCase):