Skip to content

Commit

Permalink
upgrade to openclap 0.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
jbilcke-hf committed Jul 24, 2024
1 parent 74c9d0e commit 0de2197
Show file tree
Hide file tree
Showing 30 changed files with 3,423 additions and 348 deletions.
1,580 changes: 1,268 additions & 312 deletions package-lock.json

Large diffs are not rendered by default.

15 changes: 9 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"format:fix": "prettier --write --ignore-path .gitignore ./src/",
"lint": "next lint",
"lint:fix": "next lint --fix",
"test": "npm run build && npm run test:unit:ci && npm run test:e2e",
"test": "npm run build && npm run test:unit:ci",
"test_TEMPORARY_DISABLED": "npm run build && npm run test:unit:ci && npm run test:e2e",
"test:unit:ci": "vitest run",
"test:unit:watch": "vitest",
"test:e2e": "npx playwright test",
Expand All @@ -35,11 +36,11 @@
"electron:make": "npm run build && electron-forge make"
},
"dependencies": {
"@aitube/broadway": "0.0.22",
"@aitube/clap": "0.0.30",
"@aitube/clapper-services": "0.0.35",
"@aitube/engine": "0.0.26",
"@aitube/timeline": "0.0.45",
"@aitube/broadway": "0.1.1",
"@aitube/clap": "0.1.1",
"@aitube/clapper-services": "0.1.1",
"@aitube/engine": "0.1.1",
"@aitube/timeline": "0.1.1",
"@fal-ai/serverless-client": "^0.13.0",
"@ffmpeg/ffmpeg": "^0.12.10",
"@ffmpeg/util": "^0.12.1",
Expand Down Expand Up @@ -84,6 +85,7 @@
"@types/dom-speech-recognition": "^0.0.4",
"@xenova/transformers": "github:xenova/transformers.js#v3",
"autoprefixer": "10.4.19",
"base64-arraybuffer": "^1.0.2",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1",
"cmdk": "^0.2.1",
Expand Down Expand Up @@ -146,6 +148,7 @@
"@types/react-dom": "^18",
"@types/uuid": "^9.0.8",
"@vitejs/plugin-react": "^4.3.1",
"@webgpu/types": "^0.1.44",
"electron": "^31.2.1",
"eslint": "^8",
"eslint-config-next": "14.2.5",
Expand Down
4 changes: 4 additions & 0 deletions playwright.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ export default defineConfig({
trace: 'on-first-retry',
},

expect: {
timeout: 10000,
},

/* Configure projects for major browsers */
projects: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/components/monitor/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export function Monitor() {
>
<UniversalPlayer />
<PlayerControls />
<div className="absolute right-0 top-8 z-20">
<div className="absolute right-0 top-0 z-20">
<div
onClick={() => setFullscreen()}
className={cn(
Expand Down
2 changes: 1 addition & 1 deletion src/components/toolbars/bottom-bar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export function BottomToolbar() {
<span className="text-stone-300/70">{APP_REVISION}</span>
</div>

<Metrics />
{/* <Metrics /> */}
</div>
<div className="flex flex-row space-x-6">
<Tasks />
Expand Down
8 changes: 1 addition & 7 deletions src/components/toolbars/bottom-bar/metrics/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,8 @@ import { cn } from '@/lib/utils'
export function Metrics() {
const { isAvailable, isMeasuring, bytes, humanReadableString } =
usePerformanceMeter({
delayBetweenMeasures: 20,
delayBetweenMeasures: 40,
})
console.log('debug:', {
isAvailable,
isMeasuring,
bytes,
humanReadableString,
})

if (!isAvailable) {
return null
Expand Down
6 changes: 3 additions & 3 deletions src/components/toolbars/editors-menu/EditorsSideMenuItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,17 @@ export function EditorsSideMenuItem({
`transition-all duration-200 ease-out`,
`items-center justify-center`,
unmanaged || isActive ? '' : `cursor-pointer`,
`border-l-[3px]`,
`border-l-[2px]`,
isActive
? 'fill-gray-50 text-gray-50 hover:fill-gray-50 hover:text-gray-50'
: 'hover:tefillxt-gray-200 fill-gray-400 text-gray-400 hover:text-gray-200',
: 'fill-gray-400 text-gray-400 hover:fill-gray-200 hover:text-gray-200',
`group`
)}
style={{
// background: theme.editorMenuBgColor || theme.defaultBgColor || "#eeeeee",
borderColor: isActive
? theme.defaultPrimaryColor || '#ffffff'
: '#111827',
: 'rgba(0,0,0,0)',
}}
onClick={handleClick}
>
Expand Down
35 changes: 33 additions & 2 deletions src/components/toolbars/top-menu/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { cn } from '@aitube/timeline'
import { TbBrandDiscord } from 'react-icons/tb'
import { FaGithubAlt } from 'react-icons/fa'

import { Menubar } from '@/components/ui/menubar'
import { APP_REVISION } from '@/lib/core/constants'
import { useUI, useResolver } from '@/services'

import { TopMenuFile } from './file'
Expand All @@ -15,6 +16,11 @@ import { TopMenuAssistant } from './assistant'
import { TopMenuView } from './view'
import { TopMenuLogo } from './TopMenuLogo'
import { TopMenuPlugins } from './plugins'
import {
Tooltip,
TooltipContent,
TooltipTrigger,
} from '@/components/ui/tooltip'

export function TopMenu() {
const isBusyResolving = useResolver((s) => s.isBusyResolving)
Expand Down Expand Up @@ -43,12 +49,37 @@ export function TopMenu() {
<TopMenuView />
<div
className={cn(
`pointer-events-none flex flex-grow flex-row items-center justify-end px-2 text-xs text-stone-300`
`flex flex-grow flex-row items-center justify-end space-x-3 px-2 text-xs`
)}
>
{
// clap?.meta?.title || "Untitled"
}
<Tooltip>
<TooltipTrigger className="">
<div className="scale-100 cursor-pointer text-stone-300/70 transition-all duration-200 ease-in-out hover:scale-110 hover:text-stone-100/90">
<a href="https://discord.gg/AEruz9B92B" target='"_blank'>
<TbBrandDiscord className="h-4 w-4" />
</a>
</div>
</TooltipTrigger>
<TooltipContent className="mr-4 mt-2 text-xs font-light">
Community
</TooltipContent>
</Tooltip>

<Tooltip>
<TooltipTrigger className="">
<div className="scale-100 cursor-pointer text-stone-300/70 transition-all duration-200 ease-in-out hover:scale-110 hover:text-stone-100/90">
<a href="https://discord.gg/AEruz9B92B" target='"_blank'>
<FaGithubAlt className="h-4 w-4" />
</a>
</div>
</TooltipTrigger>
<TooltipContent className="mr-4 mt-2 text-xs font-light">
Code
</TooltipContent>
</Tooltip>
</div>
</Menubar>
)
Expand Down
6 changes: 3 additions & 3 deletions src/components/tree-browsers/stores/useEntityLibrary.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use client'

import { create } from 'zustand'
import { ClapEntity, UUID } from '@aitube/clap'
import { ClapEntity, ClapSegmentCategory, UUID } from '@aitube/clap'
import {
CivitaiCollection,
LibraryNodeItem,
Expand Down Expand Up @@ -191,10 +191,10 @@ export const useEntityLibrary = create<{
icon: icons.misc,
className: itemClassName,
}
if (entity.category === 'character') {
if (entity.category === ClapSegmentCategory.CHARACTER) {
node.icon = icons.character
characters.children!.push(node)
} else if (entity.category === 'location') {
} else if (entity.category === ClapSegmentCategory.LOCATION) {
node.icon = icons.location
locations.children!.push(node)
} else {
Expand Down
6 changes: 3 additions & 3 deletions src/components/tree-browsers/stores/useProjectLibrary.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use client'

import { create } from 'zustand'
import { ClapEntity, UUID } from '@aitube/clap'
import { ClapEntity, ClapSegmentCategory, UUID } from '@aitube/clap'

import { icons } from '@/components/icons'

Expand Down Expand Up @@ -85,11 +85,11 @@ export const useProjectLibrary = create<{
icon: icons.misc,
className: collectionClassName,
}
if (entity.category === 'character') {
if (entity.category === ClapSegmentCategory.CHARACTER) {
node.icon = icons.character
node.nodeType = 'LIB_NODE_PROJECT_ENTITY_CHARACTER'
characters.children!.push(node)
} else if (entity.category === 'location') {
} else if (entity.category === ClapSegmentCategory.LOCATION) {
node.icon = icons.location
node.nodeType = 'LIB_NODE_PROJECT_ENTITY_LOCATION'
locations.children!.push(node)
Expand Down
3 changes: 3 additions & 0 deletions src/experiments/grading/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Utilities to apply color grading to an image.

The purpose is to be able to unify / homogeneize
Loading

0 comments on commit 0de2197

Please sign in to comment.