Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions ansys/rep/client/auth/api/auth_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@
# Author(s): F.Negri, O.Koenig
# ----------------------------------------------------------

from typing import List

from keycloak import KeycloakAdmin

from ..resource import User
from ..schema.user import UserSchema


Expand Down Expand Up @@ -44,11 +47,11 @@ def __init__(self, client):
def url(self):
return f"{self.client.rep_url}/auth/"

def get_users(self, as_objects=True):
def get_users(self, as_objects=True) -> List[User]:
"""Return a list of users."""
return get_users(self.client, as_objects=as_objects)

def create_user(self, user, as_objects=True):
def create_user(self, user: User, as_objects=True) -> User:
"""Create a new user.

Args:
Expand All @@ -57,7 +60,7 @@ def create_user(self, user, as_objects=True):
"""
return create_user(self.client, user, as_objects=as_objects)

def update_user(self, user, as_objects=True):
def update_user(self, user: User, as_objects=True) -> User:
"""Modify an existing user.

Args:
Expand All @@ -66,7 +69,7 @@ def update_user(self, user, as_objects=True):
"""
return update_user(self.client, user, as_objects=as_objects)

def delete_user(self, user):
def delete_user(self, user: User) -> None:
"""Delete an existing user.

Args:
Expand Down
31 changes: 21 additions & 10 deletions ansys/rep/client/auth/resource/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,27 @@ class Meta:
schema = UserSchema
rest_name = "None"

def __init__(self, **kwargs):
self.id = missing
self.username = missing
self.password = missing
self.first_name = missing
self.last_name = missing
self.email = missing
self.groups = missing
self.realm_roles = missing
self.is_admin = missing
def __init__(self,
id=missing,
username=missing,
password=missing,
first_name=missing,
last_name=missing,
email=missing,
groups=missing,
realm_roles=missing,
is_admin=missing,
**kwargs
):
self.id = id
self.username = username
self.password = password
self.first_name = first_name
self.last_name = last_name
self.email = email
self.groups = groups
self.realm_roles = realm_roles
self.is_admin = is_admin

super().__init__(**kwargs)

Expand Down
4 changes: 2 additions & 2 deletions ansys/rep/client/jms/resource/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
# ----------------------------------------------------------

from .algorithm import Algorithm
from .bool_parameter_definition import BoolParameterDefinition
from .evaluator import Evaluator
from .file import File
from .fitness_definition import FitnessDefinition, FitnessTermDefinition
from .job import Job
from .job_definition import JobDefinition
from .license_context import LicenseContext
from .operation import Operation
from .parameter_definition import ParameterDefinition, FloatParameterDefinition, IntParameterDefinition, StringParameterDefinition
from .parameter_definition import ParameterDefinition, FloatParameterDefinition, \
IntParameterDefinition, StringParameterDefinition, BoolParameterDefinition
from .parameter_mapping import ParameterMapping
from .project import Project
from .project_permission import ProjectPermission
Expand Down
26 changes: 17 additions & 9 deletions ansys/rep/client/jms/resource/algorithm.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,23 @@ class Meta:
schema = AlgorithmSchema
rest_name = "algorithms"

def __init__(self, **kwargs):
self.id = missing
self.name = missing
self.description = missing
self.creation_time = missing
self.modification_time = missing
self.data = missing
self.jobs = missing
def __init__(self,
id=missing,
name=missing,
description=missing,
creation_time=missing,
modification_time=missing,
data=missing,
jobs=missing
):
self.id = id
self.name = name
self.description = description
self.creation_time = creation_time
self.modification_time = modification_time
self.data = data
self.jobs = jobs

super().__init__(**kwargs)
self.obj_type = self.__class__.__name__

AlgorithmSchema.Meta.object_class = Algorithm
45 changes: 0 additions & 45 deletions ansys/rep/client/jms/resource/bool_parameter_definition.py

This file was deleted.

44 changes: 29 additions & 15 deletions ansys/rep/client/jms/resource/evaluator.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,35 @@ class Meta:
schema = EvaluatorSchema
rest_name = "evaluators"

def __init__(self, **kwargs):
self.id = missing
self.host_id = missing
self.name = missing
self.hostname = missing
self.platform = missing
self.task_manager_type = missing
self.project_server_select = missing
self.alive_update_interval = missing
self.update_time = missing
self.external_access_port = missing
self.project_assignment_mode = missing
self.project_list = missing
self.configuration = missing
def __init__(self,
id=missing,
host_id=missing,
name=missing,
hostname=missing,
platform=missing,
task_manager_type=missing,
project_server_select=missing,
alive_update_interval=missing,
update_time=missing,
external_access_port=missing,
project_assignment_mode=missing,
project_list=missing,
configuration=missing
):
self.id = id
self.host_id = host_id
self.name = name
self.hostname = hostname
self.platform = platform
self.task_manager_type = task_manager_type
self.project_server_select = project_server_select
self.alive_update_interval = alive_update_interval
self.update_time = update_time
self.external_access_port = external_access_port
self.project_assignment_mode = project_assignment_mode
self.project_list = project_list
self.configuration = configuration

super().__init__(**kwargs)
self.obj_type = self.__class__.__name__

EvaluatorSchema.Meta.object_class = Evaluator
51 changes: 35 additions & 16 deletions ansys/rep/client/jms/resource/file.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ class File(Object):
modification_time : datetime, optional
The date and time the file resource was last modified.
format : str, optional
expiry_time : datetime, optional
File expiration time.
evaluation_path : str, optional
Relative path under which the file instance for a job evaluation will be stored.
monitor : bool, optional
Expand All @@ -43,25 +45,42 @@ class Meta:
schema = FileSchema
rest_name = "files"

def __init__(self, src=None, **kwargs):
def __init__(self, src=None,
id=missing,
name=missing,
type=missing,
storage_id=missing,
size=missing,
hash=missing,
creation_time=missing,
modification_time=missing,
expiry_time=missing,
format=missing,
evaluation_path=missing,
monitor=missing,
collect=missing,
collect_interval=missing,
reference_id=missing
):
self.src = src
self.content = None

self.id = missing
self.name = missing
self.type = missing
self.storage_id = missing
self.size = missing
self.hash = missing
self.creation_time = missing
self.modification_time = missing
self.format = missing
self.evaluation_path = missing
self.monitor = missing
self.collect = missing
self.collect_interval = missing
self.reference_id = missing
self.id = id
self.name = name
self.type = type
self.storage_id = storage_id
self.size = size
self.hash = hash
self.creation_time = creation_time
self.modification_time = modification_time
self.expiry_time = expiry_time
self.format = format
self.evaluation_path = evaluation_path
self.monitor = monitor
self.collect = collect
self.collect_interval = collect_interval
self.reference_id = reference_id

super().__init__(**kwargs)
self.obj_type = self.__class__.__name__

FileSchema.Meta.object_class = File
53 changes: 35 additions & 18 deletions ansys/rep/client/jms/resource/job.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,24 +47,41 @@ class Meta:
schema = JobSchema
rest_name = "jobs"

def __init__(self, **kwargs):
self.id = missing
self.name = missing
self.eval_status = missing
self.job_definition_id = missing
self.priority = missing
self.values = missing
self.fitness = missing
self.fitness_term_values = missing
self.note = missing
self.creator = missing
self.executed_level = missing
self.creation_time = missing
self.modification_time = missing
self.elapsed_time = missing
self.host_ids = missing
self.file_ids = missing
def __init__(self,
id=missing,
name=missing,
eval_status=missing,
job_definition_id=missing,
priority=missing,
values=missing,
fitness=missing,
fitness_term_values=missing,
note=missing,
creator=missing,
executed_level=missing,
creation_time=missing,
modification_time=missing,
elapsed_time=missing,
host_ids=missing,
file_ids=missing
):
self.id = id
self.name = name
self.eval_status = eval_status
self.job_definition_id = job_definition_id
self.priority = priority
self.values = values
self.fitness = fitness
self.fitness_term_values = fitness_term_values
self.note = note
self.creator = creator
self.executed_level = executed_level
self.creation_time = creation_time
self.modification_time = modification_time
self.elapsed_time = elapsed_time
self.host_ids = host_ids
self.file_ids = file_ids

super().__init__(**kwargs)
self.obj_type = self.__class__.__name__

JobSchema.Meta.object_class = Job
Loading