Skip to content

Dev To Staging #1031

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.

Sign up for GitHub

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

Merged
merged 24 commits into from
Jan 24, 2025
Merged

Dev To Staging #1031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
6171b59
Merge branch 'STAGING' of https://github.com/neo4j-labs/llm-graph-bui…
prakriti-solankey Jan 14, 2025
f2a800d
rectified code to not include Document node while graph_consolidation…
kaustubh-darekar Jan 15, 2025
b7229a3
Nova models addition (#1006)
kaustubh-darekar Jan 15, 2025
d29f688
New models (#1009)
prakriti-solankey Jan 15, 2025
12ce5e8
Graph consolidation prompt updated (#1013)
kaustubh-darekar Jan 20, 2025
1ba89d1
Graph consolidation changes (#1014)
prakriti-solankey Jan 21, 2025
9e5890d
Chunks to be created (#1015)
kartikpersistent Jan 21, 2025
1624903
Oauth integration (#1011)
kartikpersistent Jan 21, 2025
05d211b
Message placement changes
kartikpersistent Jan 21, 2025
123a6bd
Docker changes
kartikpersistent Jan 21, 2025
2b230e3
Feature toggle for authentication
kartikpersistent Jan 22, 2025
0573ce2
Merge branch 'DEV' of https://github.com/neo4j-labs/llm-graph-builder…
prakriti-solankey Jan 22, 2025
cf92dd6
minor issue fixed
praveshkumar1988 Jan 22, 2025
916910b
passing and logging authenticated user email in backend logging (#1019)
kartikpersistent Jan 23, 2025
d0c0a42
Merge branch 'STAGING' into DEV
praveshkumar1988 Jan 23, 2025
04a85da
Conflict issue fixed
praveshkumar1988 Jan 23, 2025
eb92d87
default graph consolidation unchecked
kaustubh-darekar Jan 23, 2025
14438e3
time formatted as string for logging
kaustubh-darekar Jan 23, 2025
447e9f8
removed debugging react strict mode
kaustubh-darekar Jan 23, 2025
0cec19d
Remove strict (#1027)
prakriti-solankey Jan 23, 2025
debcd24
Merge branch 'STAGING' into DEV
karanchellani Jan 23, 2025
ad7fb81
all models
prakriti-solankey Jan 23, 2025
aaca322
formdata missing
prakriti-solankey Jan 24, 2025
4a14062
formatting
prakriti-solankey Jan 24, 2025
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 backend/src/shared/common_fn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ def create_gcs_bucket_folder_name_hashed(uri, file_name):

def formatted_time(current_time):
formatted_time = current_time.strftime('%Y-%m-%d %H:%M:%S %Z')
return formatted_time
return str(formatted_time)

def last_url_segment(url):
parsed_url = urlparse(url)
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/Content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,8 +533,9 @@ const Content: React.FC<ContentProps> = ({
const handleOpenGraphClick = () => {
const bloomUrl = process.env.VITE_BLOOM_URL;
const uriCoded = userCredentials?.uri.replace(/:\d+$/, '');
const connectURL = `${uriCoded?.split('//')[0]}//${userCredentials?.userName}@${uriCoded?.split('//')[1]}:${userCredentials?.port ?? '7687'
}`;
const connectURL = `${uriCoded?.split('//')[0]}//${userCredentials?.userName}@${uriCoded?.split('//')[1]}:${
userCredentials?.port ?? '7687'
}`;
const encodedURL = encodeURIComponent(connectURL);
const replacedUrl = bloomUrl?.replace('{CONNECT_URL}', encodedURL);
window.open(replacedUrl, '_blank');
Expand Down
1 change: 0 additions & 1 deletion frontend/src/context/UsersFiles.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ const FileContextProvider: FC<FileContextProviderProps> = ({ children }) => {
'enable_hybrid_search_and_fulltext_search_in_bloom',
'materialize_entity_similarities',
'enable_communities',
'graph_schema_consolidation',
]);
const [processedCount, setProcessedCount] = useState<number>(0);
const [postProcessingVal, setPostProcessingVal] = useState<boolean>(false);
Expand Down
16 changes: 8 additions & 8 deletions frontend/src/main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import App from './App.tsx';
import { SKIP_AUTH } from './utils/Constants.ts';

ReactDOM.createRoot(document.getElementById('root')!).render(
<BrowserRouter>
{SKIP_AUTH ? (
<BrowserRouter>
{SKIP_AUTH ? (
<App />
) : (
<Auth0ProviderWithHistory>
<App />
) : (
<Auth0ProviderWithHistory>
<App />
</Auth0ProviderWithHistory>
)}
</BrowserRouter>
</Auth0ProviderWithHistory>
)}
</BrowserRouter>
);
3 changes: 2 additions & 1 deletion frontend/src/services/GetNodeLabelsRelTypes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ import { ServerData } from '../types';
import api from '../API/Index';

export const getNodeLabelsAndRelTypes = async () => {
const formData = new FormData();
try {
const response = await api.post<ServerData>(`/schema`);
const response = await api.post<ServerData>(`/schema`, formData);
return response;
} catch (error) {
console.log(error);
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/services/GetOrphanNodes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ import { OrphanNodeResponse } from '../types';
import api from '../API/Index';

export const getOrphanNodes = async () => {
const formData = new FormData();
try {
const response = await api.post<OrphanNodeResponse>(`/get_unconnected_nodes_list`);
const response = await api.post<OrphanNodeResponse>(`/get_unconnected_nodes_list`, formData);
return response;
} catch (error) {
console.log(error);
Expand Down