Skip to content

Commit

Permalink
Fix linting
Browse files Browse the repository at this point in the history
  • Loading branch information
guerler committed Oct 25, 2023
1 parent 1fc9086 commit 3803774
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 45 deletions.
47 changes: 24 additions & 23 deletions lib/galaxy/managers/visualizations.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
reproduce a specific view in a Galaxy visualization.
"""
import logging

from typing import (
Dict,
List,
Expand All @@ -17,30 +16,25 @@
or_,
true,
)
from sqlalchemy.orm import (
aliased,
)
from sqlalchemy.orm import aliased

from galaxy import (
exceptions,
model,
)
from galaxy.managers import (base, sharable)
from galaxy.managers import (
base,
sharable,
)
from galaxy.managers.context import ProvidesUserContext

from galaxy.model.index_filter_util import (
append_user_filter,
raw_text_column_filter,
tag_filter,
text_column_filter,
)

from galaxy.schema.visualization import (
VisualizationIndexQueryPayload,
)

from galaxy.schema.visualization import VisualizationIndexQueryPayload
from galaxy.structured_app import MinimalManagerApp

from galaxy.util.search import (
FilteredTerm,
parse_filters_structured,
Expand Down Expand Up @@ -188,17 +182,24 @@ def __init__(self, app: MinimalManagerApp):
self.visualization_manager = self.manager

self.default_view = "summary"
self.add_view("summary", [
"id",
"title",
"type",
"dbkey",
])
self.add_view("detailed", [
"create_time",
"tags",
"update_time",
], include_keys_from="summary",)
self.add_view(
"summary",
[
"id",
"title",
"type",
"dbkey",
],
)
self.add_view(
"detailed",
[
"create_time",
"tags",
"update_time",
],
include_keys_from="summary",
)

def add_serializers(self):
super().add_serializers()
Expand Down
17 changes: 7 additions & 10 deletions lib/galaxy/schema/visualization.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,17 @@
Extra,
Field,
)
from typing_extensions import (
Literal,
)
from typing_extensions import Literal

from galaxy.schema.fields import (
DecodedDatabaseIdField,
)
from galaxy.schema.fields import DecodedDatabaseIdField
from galaxy.schema.schema import (
CreateTimeField,
TagCollection,
UpdateTimeField,
Model,
SharingStatus,
TagCollection,
UpdateTimeField,
)


VisualizationSortByEnum = Literal["create_time", "title", "update_time", "username"]


Expand All @@ -32,7 +27,9 @@ class VisualizationIndexQueryPayload(Model):
show_published: Optional[bool] = None
show_shared: Optional[bool] = None
user_id: Optional[DecodedDatabaseIdField] = None
sort_by: VisualizationSortByEnum = Field("update_time", title="Sort By", description="Sort pages by this attribute.")
sort_by: VisualizationSortByEnum = Field(
"update_time", title="Sort By", description="Sort pages by this attribute."
)
sort_desc: Optional[bool] = Field(default=True, title="Sort descending", description="Sort in descending order.")
search: Optional[str] = Field(default=None, title="Filter text", description="Freetext to search.")
limit: Optional[int] = Field(default=100, lt=1000, title="Limit", description="Maximum number of pages to return.")
Expand Down
9 changes: 4 additions & 5 deletions lib/galaxy/webapps/galaxy/api/visualizations.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@
"""
import json
import logging

from typing import (
Optional,
)
from typing import Optional

from fastapi import (
Body,
Expand Down Expand Up @@ -90,7 +87,9 @@

ShowPublishedQueryParam: bool = Query(default=True, title="Include published visualizations.", description="")

ShowSharedQueryParam: bool = Query(default=False, title="Include visualizations shared with authenticated user.", description="")
ShowSharedQueryParam: bool = Query(
default=False, title="Include visualizations shared with authenticated user.", description=""
)

SortByQueryParam: VisualizationSortByEnum = Query(
default="update_time",
Expand Down
8 changes: 1 addition & 7 deletions lib/galaxy/webapps/galaxy/services/visualizations.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,18 @@
import logging

from typing import (
Any,
List,
Tuple,
)

from galaxy import exceptions

from galaxy.managers.notification import NotificationManager
from galaxy.managers.visualizations import (
VisualizationManager,
VisualizationSerializer,
)
from galaxy.schema.visualization import VisualizationIndexQueryPayload
from galaxy.security.idencoding import IdEncodingHelper

from galaxy.schema.visualization import (
VisualizationIndexQueryPayload,
)
from galaxy.webapps.galaxy.services.base import ServiceBase
from galaxy.webapps.galaxy.services.sharable import ShareableService

Expand Down Expand Up @@ -51,7 +46,6 @@ def index(
payload: VisualizationIndexQueryPayload,
detailed: bool = False,
include_total_count: bool = False,
sharing: bool = False,
) -> Tuple[List[Any], int]:
"""Return a list of Visualizations viewable by the user
Expand Down

0 comments on commit 3803774

Please sign in to comment.