Feature/fs selection #56
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ingAlgorithm in models.py) - [src/feature_selection/models.py] - [src/feature_selection/fs_models.py] - [src/feature_selection/views.py] - [src/frontend/static/frontend/src/components/biomarkers/labels/ClusteringAlgotithmLable.tsx] - [src/frontend/static/frontend/src/components/biomarkers/types.ts] - [src/frontend/static/frontend/src/components/biomarkers/utils.ts]
Genarito
reviewed
Oct 17, 2024
src/api_service/mrna_service.py
Outdated
| if modulector_settings['protocol'] == 'http' and modulector_settings['port'] == 80: | ||
| self.url_modulector_prefix = f"{modulector_settings['protocol']}://{modulector_settings['host']}" | ||
| elif modulector_settings['protocol'] == 'https' and modulector_settings['port'] == 443: | ||
| self.url_modulector_prefix = f"{modulector_settings['protocol']}://{modulector_settings['host']}" |
There was a problem hiding this comment.
Tanto esta línea como la del caso de "http" son lo mismo, yo lo que haría sería:
- Armar la URL con el protocolo y sin el puerto
- Lo que veo que estás haciendo es ignorar el puerto en caso de que sea el que va por defecto, así que pondría el if y elif en un solo if con un simple
orpreguntando si el puerto debería ser incluído a la URL o no. - Entonces lo que haría adentro de este if sería agregar el puerto
- Documentar qué es lo que se está haciendo con un comentario
- Poner en una función dentro de la clase para que no sea código duplicado con lo de BioAPI
Te quedaría algo como esto:
modulector_settings = settings.MODULECTOR_SETTINGS
self.url_modulector_prefix = f"{modulector_settings['protocol']}://{modulector_settings['host']}"
# Removes the port from the URL if it is the default port for the protocol
if ((modulector_settings['protocol'] == 'http' and modulector_settings['port'] != 80) or
(modulector_settings['protocol'] == 'https' and modulector_settings['port'] != 443)):
self.url_modulector_prefix += f":{modulector_settings['port']}"Te dejo el punto 5 para corregir esto y lo de BioAPI abajo!
There was a problem hiding this comment.
Se tomaron en cuenta todos los puntos mencionados, por lo que se creó una función con la lógica necesaria para no repetir funcionalidad y se agregaron comentarios
modulector_settings = settings.MODULECTOR_SETTINGS
self.url_modulector_prefix = self.__build_url(modulector_settings)
bioapi_settings = settings.BIOAPI_SETTINGS
self.url_bioapi_prefix = self.__build_url(bioapi_settings)protocol = settings['protocol']
host = settings['host']
port = settings['port']
if (protocol == 'http' and port == 80) or (protocol == 'https' and port == 443):
return f"{protocol}://{host}"
else:
return f"{protocol}://{host}:{port}"
Genarito
reviewed
Oct 17, 2024
| @@ -33,6 +33,7 @@ class ClusteringAlgorithm(models.IntegerChoices): | |||
| """Clustering algorithm.""" | |||
| K_MEANS = 1 | |||
| SPECTRAL = 2 # TODO: implement in backend | |||
| BK_MEANS = 3 | |||
There was a problem hiding this comment.
Siempre que se cambia un campo que va hacia un modelo se tiene que correr el comando python3 manage.py makemigrations y luego python3 manage.py migrate así la DB se entera.
Ese archivo .py que es la migración también pusheala a este PR por fa!
There was a problem hiding this comment.
Se agregaron las migraciones faltantes 👨💻
|
Se configura para dejar como default el consumo de Modulector y Bioapi de manera online
|
Se configura para que de manera default se consuma los servicios online de Modulector y BioApi |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Se agrega algoritmo de BKMEANS y se fixea la configuracion para poder consumir las APIs publicas de BIOAPI y MODULECTOR