Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
d23f9c4
Version funcional
angel-gutierrez-gonzalez Mar 1, 2024
ea24680
Proyección 3d
angel-gutierrez-gonzalez Mar 18, 2024
074c989
Refactoring 3d graphic code and add button to change between graphics
angel-gutierrez-gonzalez Jun 4, 2024
35fa35e
LoadData modal window and notebook execution
angel-gutierrez-gonzalez Jun 4, 2024
e1ab5b5
Plot zoom projections_plot_ui
angel-gutierrez-gonzalez Jun 5, 2024
9f1c930
Selection of a point on the 3d graph and its next
angel-gutierrez-gonzalez Jun 5, 2024
d3d5fbf
Merge branch 'master' into develop-angel
angel-gutierrez-gonzalez Jun 6, 2024
393b24c
Delete duplicate entry docker-compose
angel-gutierrez-gonzalez Jun 6, 2024
e5b46e1
Modified base.yaml variables and added libraries
angel-gutierrez-gonzalez Jun 6, 2024
2af5384
no tiene sentido copiar dvats dentro de nbs_pipeline
misantamaria Jun 13, 2024
7f58a47
Traido master
misantamaria Jul 11, 2024
45d558d
Docker rstudio-server service fixed
misantamaria Jul 11, 2024
cbdc435
restore branch
angel-gutierrez-gonzalez Jul 12, 2024
701087a
Restore Branch-resolve conflicts
angel-gutierrez-gonzalez Jul 12, 2024
b6f9a09
restaurado server.R
misantamaria Jul 18, 2024
d60a6ae
preview plot file data selected
angel-gutierrez-gonzalez Jul 18, 2024
c5f256d
ploomber import added
angel-gutierrez-gonzalez Jul 18, 2024
50cb86b
Añadido utf-8 en get_artifact_config_sd2a
misantamaria Jul 23, 2024
9310e63
Comentados los system de ejecucion de los notebooks. Añadido ploomber…
misantamaria Jul 23, 2024
5a4d8f1
Revisado get_input_output id para el nb 02c.
misantamaria Jul 23, 2024
5a1f6e5
tratando de arreglar problemas con ficheros grandes
misantamaria Jul 23, 2024
63eeed7
modificados utf-8 en el segundo while de replace_includes_with_content
misantamaria Jul 23, 2024
42abbdb
Añadida la celda de parametros de entrada en 02c
misantamaria Jul 23, 2024
851c5ab
Segunda ejecucion completada correctamente
misantamaria Jul 23, 2024
89168b6
ejecucion completa pero no encuentra artefacto
misantamaria Jul 23, 2024
96847fb
Fallo interacción gráficos
angel-gutierrez-gonzalez Oct 23, 2024
f3649a8
Solucion error interacción gráficos
angel-gutierrez-gonzalez Nov 19, 2024
91f8872
Ventana modal, solución de errores showgraphics
angel-gutierrez-gonzalez Dec 16, 2024
4de8e75
Añadida interaccion entre 3d y la serie temporal
angel-gutierrez-gonzalez Dec 16, 2024
38bcc47
Modificado método de cambio entre gráficos 2D-3D
angel-gutierrez-gonzalez Dec 17, 2024
8546604
fix interación entre 3d y serie temporal
angel-gutierrez-gonzalez Dec 17, 2024
53efc82
Inicialización variables de configuración verntana modal
angel-gutierrez-gonzalez Dec 17, 2024
acedbf1
Fix grafico 3d, nuevo boton reset
angel-gutierrez-gonzalez Jan 8, 2025
9fcff6b
Gráfico 3D sin ejes
angel-gutierrez-gonzalez Jan 11, 2025
8cda386
Eliminadas cuadriculas de fondo gráfico 2D
angel-gutierrez-gonzalez Jan 11, 2025
53dab88
Corrección ajuste de visualización 2D
angel-gutierrez-gonzalez Jan 12, 2025
004b63a
Persistencia de zoom e Original data
angel-gutierrez-gonzalez Jan 14, 2025
1d0a1ec
Botón que permite activar y desactivar persistencia de zoom
angel-gutierrez-gonzalez Jan 14, 2025
d68581b
Modificación actualización cambio de graficas
angel-gutierrez-gonzalez Jan 15, 2025
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
1,331 changes: 1,331 additions & 0 deletions .Trash-1005/files/01_dataset_artifact-output.ipynb

Large diffs are not rendered by default.

3,220 changes: 3,220 additions & 0 deletions .Trash-1005/files/02b_encoder_MVP-output.ipynb

Large diffs are not rendered by default.

1,467 changes: 1,467 additions & 0 deletions .Trash-1005/files/02c_encoder_MVP-sliding_window_view-output.ipynb

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions .Trash-1005/info/01_dataset_artifact-output.ipynb.trashinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[Trash Info]
Path=nbs_pipeline/output/01_dataset_artifact-output.ipynb
DeletionDate=2024-07-23T13:32:34
3 changes: 3 additions & 0 deletions .Trash-1005/info/02b_encoder_MVP-output.ipynb.trashinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[Trash Info]
Path=nbs_pipeline/output/02b_encoder_MVP-output.ipynb
DeletionDate=2024-07-23T13:32:34
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[Trash Info]
Path=nbs_pipeline/output/02c_encoder_MVP-sliding_window_view-output.ipynb
DeletionDate=2024-07-23T13:32:34
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -166,3 +166,5 @@ checklink/cookies.txt
/docker_test/
/docker/tmp_configComits.sh
.Trash-1004
.installing
quarto-linux-amd64.deb
10 changes: 9 additions & 1 deletion docker/DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
Package: vdvats
Version: 0.1.0
Title: DeepVATS
Description: Deep Learning Visual Analytics Tools
Depends:
R (>= 3.6.0),
shiny,
Expand All @@ -13,7 +17,11 @@ Depends:
zoo,
reticulate,
xts,
plotly,
shinyFiles,
yaml,
xts,
semantic.dashboard
Remotes:
r-lib/later,
apache/arrow/r
apache/arrow/r
8 changes: 8 additions & 0 deletions docker/Dockerfile.rstudio
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
FROM misantamaria/dvats-rstudio:rocker-ml4.2
SHELL [ "/bin/bash", "--login", "-c" ]



COPY ./docker/DESCRIPTION /tmp/

## Add Rstudio Server user
ARG USER=user
ARG UID=1000
Expand Down Expand Up @@ -41,6 +45,10 @@ RUN chmod u+x /usr/local/bin/entrypoint-rstudio.sh

WORKDIR $HOME

RUN R -e "devtools::install_deps('/tmp', dependencies = TRUE)"

# Initialize R-Stusio Server
ENTRYPOINT [ "/usr/local/bin/entrypoint-rstudio.sh" ]



5 changes: 3 additions & 2 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,10 @@ services:
# TODO (28/03/2023): I don't know why it is not working without this
- ENV_VARS=WANDB_ENTITY,WANDB_API_KEY,WANDB_PROJECT,USER,USERID,GROUPID,PASSWORD,ROOT,CUDA_VISIBLE_DEVICES
volumes:
- ../r_shiny_app:/home/${USER_NAME}/app
- ../r_shiny_app:/home/${USER_NAME}/work/app
- ${LOCAL_DATA_PATH}:/home/${USER_NAME}/data/
- ../dvats:/home/${USER_NAME}/dvats
- ../nbs_pipeline:/home/${USER_NAME}/work/nbs_pipeline
- conda-env:/usr/local/share/miniconda3/envs/env
- miniconda:/home/user/local/share/miniconda3
deploy:
Expand All @@ -86,4 +87,4 @@ services:
volumes:
conda-env:
miniconda:
lib:
lib:
4 changes: 0 additions & 4 deletions docker/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,6 @@ fi
[ -d "/home/$USER/data/wandb_artifacts" ] || mkdir -p "/home/$USER/data/wandb_artifacts"


if ! grep -Fxq "./path/to/check_yml_changes.sh" $HOME/work/.git/hooks/pre-commit; then \
sed -i '$i./path/to/check_yml_changes.sh' $HOME/work/.git/hooks/pre-commit; \
fi

exec "$@"


4 changes: 2 additions & 2 deletions dvats/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def replace_includes_with_content(
"""
if (print_flag):
print("... About to replace includes with content")
with open(path+filename, 'r') as f:
with open(path+filename, 'r', encoding = 'utf-8') as f:
content = f.read()

# Mientras exista una directiva !include en el contenido, sigue reemplazándola
Expand All @@ -84,7 +84,7 @@ def replace_includes_with_content(
include_filename = content[start_quote_idx:end_quote_idx]

# Lee el archivo incluido
with open(path+include_filename, 'r') as include_file:
with open(path+include_filename, 'r', encoding = 'utf-8') as include_file:
included_content = include_file.read()

# Reemplaza la directiva por el contenido del archivo incluido
Expand Down
16 changes: 14 additions & 2 deletions nbs/config.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
" \"\"\"\n",
" if (print_flag):\n",
" print(\"... About to replace includes with content\")\n",
" with open(path+filename, 'r') as f:\n",
" with open(path+filename, 'r', encoding = 'utf-8') as f:\n",
" content = f.read()\n",
" \n",
" # Mientras exista una directiva !include en el contenido, sigue reemplazándola\n",
Expand All @@ -212,7 +212,7 @@
" include_filename = content[start_quote_idx:end_quote_idx]\n",
" \n",
" # Lee el archivo incluido\n",
" with open(path+include_filename, 'r') as include_file:\n",
" with open(path+include_filename, 'r', encoding = 'utf-8') as include_file:\n",
" included_content = include_file.read()\n",
" \n",
" # Reemplaza la directiva por el contenido del archivo incluido\n",
Expand Down Expand Up @@ -2831,6 +2831,18 @@
"display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "python3"
},
"language_info": {
"codemirror_mode": {
"name": "ipython",
"version": 3
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.13"
}
},
"nbformat": 4,
Expand Down
Loading