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
2 changes: 1 addition & 1 deletion bbconf/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.14.1"
__version__ = "0.14.2"
21 changes: 21 additions & 0 deletions bbconf/bbagent.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import numpy as np
from sqlalchemy.orm import Session
from sqlalchemy.engine import ScalarResult
from sqlalchemy.sql import and_, distinct, func, or_, select

from bbconf.config_parser.bedbaseconfig import BedBaseConfig
Expand All @@ -21,6 +22,7 @@
UsageBedSetMeta,
UsageFiles,
UsageSearch,
ReferenceGenome,
)
from bbconf.models.base_models import (
AllFilesInfo,
Expand Down Expand Up @@ -778,3 +780,22 @@ def _get_geo_stats(self, sa_session: Session) -> GEOStatistics:
median=round(statistics.median(file_sizes), 2),
),
)

def get_reference_genomes(self) -> Dict[str, str]:
"""
Get mapping of genome aliases to reference genome names.

:return: dict mapping genome_alias -> reference_genome_name
"""

genomes = {}

with Session(self.config.db_engine.engine) as session:
results: ScalarResult[ReferenceGenome] = session.scalars(
select(ReferenceGenome)
)

for genome in results:
genomes[genome.digest] = genome.alias

return genomes
31 changes: 16 additions & 15 deletions bbconf/modules/bedfiles.py
Original file line number Diff line number Diff line change
Expand Up @@ -556,21 +556,22 @@ def add(
if not overwrite:
bed_metadata = StandardMeta(**metadata)

## OLD:
# self._update_sources(
# identifier=identifier,
# global_sample_id=metadata_standard.global_sample_id,
# global_experiment_id=metadata_standard.global_experiment_id,
# )

with Session(self._sa_engine) as session:
statement = select(Bed).where(Bed.id == identifier)
bed_object = session.scalar(statement)
self._update_metadata(
sa_session=session,
bed_object=bed_object,
bed_metadata=bed_metadata,
)
## UPDATE ONLY sources:
self._update_sources(
identifier=identifier,
global_sample_id=bed_metadata.global_sample_id,
global_experiment_id=bed_metadata.global_experiment_id,
)

## IF we want to update all metadata on add if exists: (DO not remove this code)
# with Session(self._sa_engine) as session:
# statement = select(Bed).where(Bed.id == identifier)
# bed_object = session.scalar(statement)
# self._update_metadata(
# sa_session=session,
# bed_object=bed_object,
# bed_metadata=bed_metadata,
# )
if not nofail:
raise BedFIleExistsError(
f"Bed file with id: {identifier} already exists in the database."
Expand Down
4 changes: 4 additions & 0 deletions docs/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html) and [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) format.


### [0.14.2] - 2026-01-21
### Added:
- Added method that fetches available reference genomes

### [0.14.0] - 2025-12-18
### Fixed:
- Insertion of tokenized files
Expand Down
4 changes: 2 additions & 2 deletions requirements/requirements-all.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
yacman >= 0.9.1
sqlalchemy >= 2.0.0
gtars >= 0.5.2
geniml[ml] >= 0.8.3
gtars >= 0.5.3
geniml[ml] >= 0.8.4
psycopg >= 3.1.15
coloredlogs
pydantic >= 2.9.0
Expand Down
Loading