fix: tidy up unused files, unrelated changes

This commit is contained in:
psychedelicious 2023-12-03 19:00:01 +11:00
parent 907340b1e1
commit 375c9a1c20
11 changed files with 15 additions and 139 deletions

View File

@ -112,7 +112,7 @@ GENERATION_MODES = Literal[
]
@invocation("core_metadata", title="Core Metadata", tags=["metadata"], category="metadata", version="1.2.0")
@invocation("core_metadata", title="Core Metadata", tags=["metadata"], category="metadata", version="1.0.1")
class CoreMetadataInvocation(BaseInvocation):
"""Collects core generation metadata into a MetadataField"""

View File

@ -1,61 +0,0 @@
from typing import Annotated, Any, Callable
from pydantic import GetJsonSchemaHandler
from pydantic.json_schema import JsonSchemaValue
from pydantic_core import core_schema
from semver import Version
class _VersionPydanticAnnotation:
"""
Pydantic annotation for semver.Version.
Requires a field_serializer to serialize to a string.
Usage:
class MyModel(BaseModel):
version: SemVer = Field(..., description="The version of the model.")
@field_serializer("version")
def serialize_version(self, version: SemVer, _info):
return str(version)
MyModel(version=semver.Version.parse("1.2.3"))
MyModel.model_validate({"version":"1.2.3"})
"""
@classmethod
def __get_pydantic_core_schema__(
cls,
_source_type: Any,
_handler: Callable[[Any], core_schema.CoreSchema],
) -> core_schema.CoreSchema:
def validate_from_str(value: str) -> Version:
return Version.parse(value)
from_str_schema = core_schema.chain_schema(
[
core_schema.str_schema(),
core_schema.no_info_plain_validator_function(validate_from_str),
]
)
return core_schema.json_or_python_schema(
json_schema=from_str_schema,
python_schema=core_schema.union_schema(
[
core_schema.is_instance_schema(Version),
from_str_schema,
]
),
serialization=core_schema.to_string_ser_schema(),
)
@classmethod
def __get_pydantic_json_schema__(
cls, _core_schema: core_schema.CoreSchema, handler: GetJsonSchemaHandler
) -> JsonSchemaValue:
return handler(core_schema.str_schema())
SemVer = Annotated[Version, _VersionPydanticAnnotation]

View File

@ -14,7 +14,7 @@ import { useTranslation } from 'react-i18next';
import { FaDownload, FaPlus } from 'react-icons/fa';
import { useBoardName } from 'services/api/hooks/useBoardName';
import { BoardDTO } from 'services/api/types';
import { MENU_LIST_MOTION_PROPS } from 'theme/components/menu';
import { menuListMotionProps } from 'theme/components/menu';
import GalleryBoardContextMenuItems from './GalleryBoardContextMenuItems';
import NoBoardContextMenuItems from './NoBoardContextMenuItems';
import { useFeatureStatus } from 'features/system/hooks/useFeatureStatus';
@ -94,7 +94,7 @@ const BoardContextMenu = ({
() => (
<MenuList
sx={{ visibility: 'visible !important' }}
motionProps={MENU_LIST_MOTION_PROPS}
motionProps={menuListMotionProps}
onContextMenu={skipEvent}
>
<MenuGroup title={boardName}>

View File

@ -46,7 +46,7 @@ import {
useLazyGetImageWorkflowQuery,
} from 'services/api/endpoints/images';
import { useDebouncedMetadata } from 'services/api/hooks/useDebouncedMetadata';
import { MENU_LIST_MOTION_PROPS } from 'theme/components/menu';
import { menuListMotionProps } from 'theme/components/menu';
const currentImageButtonsSelector = createSelector(
[stateSelector, activeTabNameSelector],
@ -248,7 +248,7 @@ const CurrentImageButtons = () => {
isDisabled={!imageDTO}
icon={<FaEllipsis />}
/>
<MenuList motionProps={MENU_LIST_MOTION_PROPS}>
<MenuList motionProps={menuListMotionProps}>
{imageDTO && <SingleSelectionMenuItems imageDTO={imageDTO} />}
</MenuList>
</Menu>

View File

@ -5,7 +5,7 @@ import {
} from 'common/components/IAIContextMenu';
import { MouseEvent, memo, useCallback } from 'react';
import { ImageDTO } from 'services/api/types';
import { MENU_LIST_MOTION_PROPS } from 'theme/components/menu';
import { menuListMotionProps } from 'theme/components/menu';
import SingleSelectionMenuItems from './SingleSelectionMenuItems';
import { createSelector } from '@reduxjs/toolkit';
import { stateSelector } from 'app/store/store';
@ -44,7 +44,7 @@ const ImageContextMenu = ({ imageDTO, children }: Props) => {
return (
<MenuList
sx={{ visibility: 'visible !important' }}
motionProps={MENU_LIST_MOTION_PROPS}
motionProps={menuListMotionProps}
onContextMenu={skipEvent}
>
<MultipleSelectionMenuItems />
@ -55,7 +55,7 @@ const ImageContextMenu = ({ imageDTO, children }: Props) => {
return (
<MenuList
sx={{ visibility: 'visible !important' }}
motionProps={MENU_LIST_MOTION_PROPS}
motionProps={menuListMotionProps}
onContextMenu={skipEvent}
>
<SingleSelectionMenuItems imageDTO={imageDTO} />

View File

@ -16,7 +16,7 @@ import {
} from 'features/nodes/store/workflowSlice';
import { MouseEvent, ReactNode, memo, useCallback, useMemo } from 'react';
import { FaMinus, FaPlus } from 'react-icons/fa';
import { MENU_LIST_MOTION_PROPS } from 'theme/components/menu';
import { menuListMotionProps } from 'theme/components/menu';
import { useTranslation } from 'react-i18next';
type Props = {
@ -110,7 +110,7 @@ const FieldContextMenu = ({ nodeId, fieldName, kind, children }: Props) => {
!menuItems.length ? null : (
<MenuList
sx={{ visibility: 'visible !important' }}
motionProps={MENU_LIST_MOTION_PROPS}
motionProps={menuListMotionProps}
onContextMenu={skipEvent}
>
<MenuGroup

View File

@ -11,9 +11,9 @@ import { useTranslation } from 'react-i18next';
const selector = createSelector(
stateSelector,
({ workflow: workflows }) => {
({ workflow }) => {
return {
fields: workflows.exposedFields,
fields: workflow.exposedFields,
};
},
defaultSelectorOptions

View File

@ -18,7 +18,7 @@ import {
FaGithub,
FaKeyboard,
} from 'react-icons/fa';
import { MENU_LIST_MOTION_PROPS } from 'theme/components/menu';
import { menuListMotionProps } from 'theme/components/menu';
import { useFeatureStatus } from 'features/system/hooks/useFeatureStatus';
import HotkeysModal from './HotkeysModal/HotkeysModal';
import InvokeAILogoComponent from './InvokeAILogoComponent';
@ -54,7 +54,7 @@ const SiteHeader = () => {
icon={<FaBars />}
sx={{ boxSize: 8 }}
/>
<MenuList motionProps={MENU_LIST_MOTION_PROPS}>
<MenuList motionProps={menuListMotionProps}>
<MenuGroup title={t('common.communityLabel')}>
{isGithubLinkEnabled && (
<MenuItem

View File

@ -75,55 +75,13 @@ export const workflowsApi = api.injectEndpoints({
}),
providesTags: [{ type: 'Workflow', id: LIST_TAG }],
}),
listRecentWorkflows: build.query<
paths['/api/v1/workflows/']['get']['responses']['200']['content']['application/json'],
void
>({
query: () => ({
url: 'workflows/',
params: {
page: 0,
per_page: 10,
order_by: 'opened_at',
direction: 'DESC',
},
}),
providesTags: [{ type: 'WorkflowsRecent', id: LIST_TAG }],
}),
listSystemWorkflows: build.query<
paths['/api/v1/workflows/']['get']['responses']['200']['content']['application/json'],
void
>({
query: () => ({
url: 'workflows/',
params: {
page: 0,
per_page: 10,
order_by: 'opened_at',
direction: 'DESC',
},
}),
transformResponse: () => {
return {
page: 0,
per_page: 10,
items: [],
total: 0,
pages: 0,
};
},
providesTags: [{ type: 'WorkflowsRecent', id: LIST_TAG }],
}),
}),
});
export const {
useGetWorkflowQuery,
useLazyGetWorkflowQuery,
useCreateWorkflowMutation,
useDeleteWorkflowMutation,
useUpdateWorkflowMutation,
useListWorkflowsQuery,
useListRecentWorkflowsQuery,
useListSystemWorkflowsQuery,
} = workflowsApi;

View File

@ -1,21 +0,0 @@
import { skipToken } from '@reduxjs/toolkit/query';
import { useAppSelector } from 'app/store/storeHooks';
import { useDebounce } from 'use-debounce';
import { useGetWorkflowQuery } from 'services/api/endpoints/workflows';
export const useDebouncedWorkflow = (workflowId?: string | null) => {
const workflowFetchDebounce = useAppSelector(
(state) => state.config.workflowFetchDebounce
);
const [debouncedWorkflowID] = useDebounce(
workflowId,
workflowFetchDebounce ?? 0
);
const { data: workflow, isLoading } = useGetWorkflowQuery(
debouncedWorkflowID ?? skipToken
);
return { workflow, isLoading };
};

View File

@ -56,7 +56,7 @@ export const menuTheme = defineMultiStyleConfig({
},
});
export const MENU_LIST_MOTION_PROPS: MotionProps = {
export const menuListMotionProps: MotionProps = {
variants: {
enter: {
visibility: 'visible',