Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v6.1 #46

Merged
merged 33 commits into from
Jan 14, 2024
Merged

v6.1 #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
3f99683
modified: index.html
0xGingi Dec 16, 2023
3e96c5b
new file: db/auth/auth.json
0xGingi Dec 17, 2023
322ceed
new file: auth/auth.json
0xGingi Dec 17, 2023
55cdeec
modified: .gitignore
0xGingi Dec 17, 2023
889f1bd
modified: index.py
0xGingi Dec 17, 2023
33a21a2
modified: index.py
0xGingi Dec 20, 2023
959c856
modified: index.sh
0xGingi Dec 20, 2023
c3bd121
Merge branch 'dev-auth' into dev
yukiarimo Dec 21, 2023
79aafbd
Merge pull request #22 from 0xGingi/dev
yukiarimo Dec 21, 2023
2e6e7da
Session Auth, Reset Password, Logout
0xGingi Dec 25, 2023
d60f49e
Session Token
0xGingi Dec 25, 2023
7ddf917
Update index.html
0xGingi Dec 25, 2023
ffbae1b
Update auth.js
0xGingi Dec 25, 2023
8db0aa8
Merge pull request #25 from 0xGingi/dev-auth
yukiarimo Dec 25, 2023
fc5e28d
gunicorn
0xGingi Dec 25, 2023
646ff53
Merge pull request #26 from yukiarimo/dev
yukiarimo Dec 25, 2023
bb453f3
Update requirements.txt
0xGingi Dec 25, 2023
50f870e
Encrypted History
0xGingi Dec 25, 2023
fa0a0de
hot fix #1
yukiarimo Dec 25, 2023
d3ba0c6
Encrypted History
0xGingi Dec 25, 2023
444a81e
Merge branch 'dev-auth' into dev-auth
yukiarimo Dec 25, 2023
02edbe6
Merge pull request #27 from 0xGingi/dev-auth
yukiarimo Dec 25, 2023
fae926b
Merge branch 'dev' into dev-auth
yukiarimo Jan 8, 2024
144d3ea
Merge pull request #35 from yukiarimo/dev-auth
yukiarimo Jan 8, 2024
c7f9873
hot fix
yukiarimo Jan 8, 2024
5e48198
fot fix
yukiarimo Jan 8, 2024
fd7cd4f
Merge pull request #37 from 0xGingi/beta
yukiarimo Jan 8, 2024
470d63d
Auth System is improved, but nothing is working now
yukiarimo Jan 10, 2024
b8ae369
Auth System Full Fix
yukiarimo Jan 12, 2024
c918eb8
test
yukiarimo Jan 14, 2024
940a04b
hot fix
yukiarimo Jan 14, 2024
843105c
v6.1
yukiarimo Jan 14, 2024
f330887
Merge branch 'beta' into dev
yukiarimo Jan 14, 2024
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ lib/models/yuna/*
static/img/call/*
!static/img/call/image_template.jpg
static/img/art/*
!static/img/art/art_template.png
!static/img/art/art_template.png
auth/auth.json
100 changes: 56 additions & 44 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ Are you tired of feeling lonely and disconnected from the world? Do you long for
- [Acknowledgments](#acknowledgments)

## Features
Based on the files and symbols in your workspace, here's a possible way to rewrite the features list:

Features Yuna AI offers the following features:
- Video and Audio Calls Handling
- Image Processing and Creation
Expand Down Expand Up @@ -95,7 +93,7 @@ To install Yuna AI, follow these steps:
To start using AI, do the following:
1. Go to the terminal
2. Run the `python index.py` command in the main directory to start the WebUI.
3. Double-click the `yuna.html` file in the directory or run it via Live Server (better).
3. Go to the `locahost:4848`.
4. Done!

> Note: port and directory or file names can depend on your configuration.
Expand All @@ -104,47 +102,61 @@ To start using AI, do the following:
The following is the file structure of the project:

```bash
├── LICENSE
├── README.html
├── SECURITY.md
├── yuna.html
├── index.py
├── index.sh
├── lib
│ ├── article.py
│ ├── datasets
│ │ ├── tasked
│ │ └── yuna
│ ├── generate.py
│ ├── models
│ │ ├── agi
│ │ └── yuna
│ ├── search.py
│ ├── translate.py
│ └── vision.py
├── manifest.json
├── requirements.txt
├── search.html
├── static
│ ├── audio
│ │ └── sounds
│ ├── config.json
│ ├── css
│ │ ├── index.css
│ │ └── kawai-v11-2.css
│ ├── db
│ │ ├── history
│ │ └── prompts
│ ├── fonts
│ │ └── kawai-font.woff
│ ├── img
│ │ ├── art
│ │ └── call
│ └── js
├── sw-toolbox.js
├── sw.js
├── test.py
└── test.txt
yuna-ai/
├── .github/ # Configuration files for GitHub
│ └── FUNDING.yml # Funding model platforms configuration
├── .gitignore # Specifies intentionally untracked files to ignore
├── CNAME # Custom domain configuration for GitHub Pages (not provided)
├── LICENSE # GNU Affero General Public License version 3
├── README.md # Documentation and instructions for Yuna AI
├── SECURITY.md # Security policy and vulnerability reporting
├── auth/ # Authentication related files (empty directory)
├── index.html # Main webpage for Yuna AI
├── services.html # Services webpage for Yuna AI
├── pricing.html # Pricing webpage for Yuna AI
├── login.html # Login webpage for Yuna AI
├── index.py # Main web application file for YunaServer
├── index.sh # Bash script for managing and configuring Yuna
├── requirements.txt # Python dependencies for YunaServer
├── requirements-amd.txt # Python dependencies for YunaServer (AMD)
├── requirements-nvidia.txt # Python dependencies for YunaServer (NVIDIA)
├── static/ # Static files for the web application
│ ├── audio/ # Audio files directory
│ │ ├── output.aiff # Sample AIFF audio file
│ │ └── output.mp3 # Sample MP3 audio file
│ ├── css/ # CSS files for styling
│ │ ├── bootstrap.min.css # Minified Bootstrap CSS
│ │ ├── index.css # Main CSS for the index page
│ │ └── kawai-v11-2.css # Custom CSS file
│ ├── db/ # Database related files
│ │ └── history/ # Chat history files
│ │ └── history_template.json # Template for chat history
│ ├── fonts/ # Fonts used in the web application
│ │ └── kawai-font.woff # Custom web font
│ ├── img/ # Image files directory
│ │ ├── call/ # Images related to call functionality
│ │ │ └── image_template.jpg # Template image for calls
│ │ ├── art/ # Artwork images
│ │ │ └── art_template.png # Template image for artwork
│ │ ├── yuna-ai.png # Yuna AI logo image
│ │ └── yuna-full.png # Full image of Yuna
│ ├── js/ # JavaScript files for interactivity
│ │ ├── bootstrap.min.js # Minified Bootstrap JS
│ │ ├── himitsu.js # Custom JS file
│ │ ├── index.js # Main JS for the index page
│ │ ├── kawai-v11-2.js # Custom JS file
│ │ ├── setup.js # JS for setup
│ │ └── theme.js # JS for theme functionality
│ │
│ └── sw.js # Service worker for offline functionality
└── lib/ # Libraries and modules for Yuna AI
│ ├── models/ # Model files for AI functionality
│ │ ├── agi/ # Artificial General Intelligence models
│ │ │ ├── README.md # Information about AGI models (excluded from .gitignore)
│ │ │ └── ... # Other AGI model files
│ │ └── yuna/ # Yuna specific model files
│ │ └── README.md # Information about Yuna models (excluded from .gitignore)
└──
```

## Yuna Abilities Overview
Expand Down
5 changes: 5 additions & 0 deletions app/chrome/background.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
chrome.action.onClicked.addListener(function () {
chrome.tabs.create({
url: 'index.html'
});
});
34 changes: 34 additions & 0 deletions app/chrome/index.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/* Additional styles to position the popover */
#floatingImage {
position: fixed;
bottom: 10px;
right: 10px;
width: 50px;
height: 50px;
cursor: pointer;
z-index: 1000;
/* Ensure the image is above other elements */
border: none;
/* Remove button border */
background: none;
/* Remove button background */
padding: 0;
/* Remove button padding */
outline: none;
/* Remove focus outline */
}

#popoverContainer {
position: fixed;
bottom: 60px;
/* Adjust this value to position the popover above the image */
right: 10px;
/* Align the popover with the right side of the image */
display: none;
z-index: 1001;
/* Ensure the popover is above the image */
width: 250px;
/* Set a fixed width for the popover */
transition: opacity 0.2s;
/* Smooth transition for popover appearance */
}
28 changes: 28 additions & 0 deletions app/chrome/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<!DOCTYPE html>
<html>

<head>
<title>Yuna AI</title>
<!-- Include Bootstrap CSS -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
<link rel="stylesheet" href="index.css">
</head>

<body>
<!-- Trigger for popover -->
<img id="floatingImage" src="yuna-ai-48.png" alt="Yuna AI">

<!-- Popover content -->
<div id="popoverContainer" class="popover bs-popover-top">
<div class="arrow"></div>
<h3 class="popover-header">Input</h3>
<div class="popover-body">
<input type="text" id="inputField" class="form-control">
<button id="submitButton" class="btn btn-primary mt-2">Submit</button>
</div>
</div>

<script src="index.js"></script>
</body>

</html>
46 changes: 46 additions & 0 deletions app/chrome/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
// Create a container for the popover
var popoverContainer = document.createElement('div');

// Set the innerHTML of the container with your popover HTML
popoverContainer.innerHTML = `
<img id="floatingImage" src="yuna-ai-48.png" alt="Yuna AI" style="position: fixed; bottom: 10px; right: 10px; cursor: pointer; z-index: 1000;">
<div id="popoverContainer" class="popover bs-popover-top" style="position: fixed; bottom: 70px; right: 10px; display: none; z-index: 1001;">
<div class="arrow"></div>
<h3 class="popover-header">Input</h3>
<div class="popover-body">
<input type="text" id="inputField" class="form-control">
<button id="submitButton" class="btn btn-primary mt-2">Submit</button>
</div>
</div>
`;

// Append the container to the body
document.body.appendChild(popoverContainer);

// Create the link element for Bootstrap CSS
var bootstrapLink = document.createElement('link');
bootstrapLink.rel = 'stylesheet';
bootstrapLink.href = 'https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css';

// Append the link element to the head of the document
document.head.appendChild(bootstrapLink);

// Vanilla JavaScript to toggle the popover
// Add event listeners for the popover functionality
window.onload = function() {
var floatingImage = document.getElementById('floatingImage');
var popover = document.getElementById('popoverContainer');

floatingImage.addEventListener('click', function() {
var isDisplayed = popover.style.display === 'block';
popover.style.display = isDisplayed ? 'none' : 'block';
popover.style.opacity = isDisplayed ? 0 : 1;
});

document.getElementById('submitButton').addEventListener('click', function() {
var input = document.getElementById('inputField');
console.log(input.value);
input.value = '';
popover.style.display = 'none';
});
};
41 changes: 41 additions & 0 deletions app/chrome/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"manifest_version": 3,
"name": "Yuna AI",
"version": "1.0",
"description": "Your Virtual AI Girlfriend",
"icons": {
"16": "yuna-ai-16.png",
"48": "yuna-ai-48.png",
"128": "yuna-ai-128.png"
},
"action": {
"default_popup": "index.html",
"default_icon": {
"16": "yuna-ai-16.png",
"48": "yuna-ai-48.png",
"128": "yuna-ai-128.png"
},
"default_title": "Click to open the popup"
},
"permissions": [
"storage",
"tabs",
"activeTab"
],
"chrome_url_overrides": {
"newtab": "index.html"
},
"background": {
"service_worker": "background.js"
},
"web_accessible_resources": [{
"resources": ["index.js", "index.css", "yuna-ai-16.png", "yuna-ai-48.png", "yuna-ai-128.png"],
"matches": ["<all_urls>"]
}],
"content_scripts": [{
"matches": ["<all_urls>"],
"js": ["index.js"],
"/css": ["index.css"],
"images": ["yuna-ai-16.png", "yuna-ai-48.png", "yuna-ai-128.png"]
}]
}
Binary file added app/chrome/yuna-ai-128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/chrome/yuna-ai-16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/chrome/yuna-ai-48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion app/src/index.js → app/electron/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const createWindow = () => {
resizable: true,
titleBarStyle: 'hidden',
title: 'Yuna AI',
icon: `${currentPath}/static/img/yuna-ai.png`,
icon: `${currentPath}/img/yuna-ai.png`,
openDevTools: false,
vibrancy: 'appearance-based',
darkTheme: true,
Expand Down
File renamed without changes.
3 changes: 3 additions & 0 deletions auth/auth.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"john": "scrypt:32768:8:1$eEWrwZJUH0GjoWxO$201347371343408c8824d8b77b31f13d6d17d14538bb01f63d43626032dddcd33e3509e9eaec5c695d496a3b8b2bbd9787fe6eb6bffaa092fab702a99efb92d7"
}
Empty file removed dialog.txt
Empty file.
Loading