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.

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

Jump to bottom

hartej (part 2) #10

Closed
wants to merge 5 commits into from
Closed

hartej (part 2) #10

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d860928
Completed part 2 of the dlp introduction project
hartejsingh12 Nov 22, 2023
126ce8e
:art: Auto-generated directory tree for repository in Architecture.md
hartejsingh12 Nov 22, 2023
2f335fb
:art: Format Python code with psf/black
hartejsingh12 Nov 22, 2023
46d0aa4
Fixed readibility and clean code error
hartejsingh12 Nov 22, 2023
a713874
Added files
hartejsingh12 Nov 22, 2023
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: 3 additions & 0 deletions backend/common/ai_drive.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ def dl_tabular_drive(trainspace_data: TrainspaceData):
X, y, category_list = get_default_dataset(default.upper(), target, features)
elif default and problem_type.upper() == "REGRESSION":
X, y, _ = get_default_dataset(default.upper(), target, features)



else:
input_df = read_df_from_bucket(
FILE_UPLOAD_BUCKET_NAME, make_train_bucket_path(trainspace_data)
Expand Down
4 changes: 4 additions & 0 deletions backendCore/dl/dl_trainer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,10 @@ def train_deep_model(
return train_deep_regression_model(
model, train_loader, test_loader, optimizer, criterion, epochs
)
elif problem_type.upper() == ProblemType.get_problem_obj(ProblemType.NONE):
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [pyright] reported by reviewdog 🐶
Cannot access member "NONE" for type "type[ProblemType]"
  Member "NONE" is unknown (reportGeneralTypeIssues)

return train_deep_regression_model(
model, train_loader, test_loader, optimizer, criterion, epochs
)


def get_deep_predictions(model: nn.Module, test_loader):
Expand Down
12 changes: 11 additions & 1 deletion frontend/src/common/components/Footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import React from "react";
import { COLORS, URLs } from "../../constants";
import { LinkedIn, YouTube, Instagram, GitHub } from "@mui/icons-material";
import { LinkedIn, YouTube, Instagram, GitHub} from "@mui/icons-material";
import { ThemeProvider, createTheme } from "@mui/material/styles";
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
import { faReact } from '@fortawesome/free-brands-svg-icons'

const theme = createTheme({
components: {
Expand Down Expand Up @@ -57,6 +59,14 @@ const Footer = () => {
>
<GitHub />
</a>
<a
className="foot-element"
title="React logo"
data-testid="react-icon"
>
<FontAwesomeIcon icon={faReact} size="2x" />
</a>

</div>
</ThemeProvider>
<div
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/common/components/NavBarMain.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ const NavbarMain = () => {
<Grid item>
{isSignedIn(user) ? (
<Link href="/train" passHref className="nav-link">
Train
Hello World
</Link>
) : null}
</Grid>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export const COLORS = Object.freeze({
});

export const URLs = Object.freeze({
donate: "https://buy.stripe.com/9AQ3e4eO81X57y8aEG",
donate: "https://www.youtube.com/watch?v=dNo_BVzNb28",
linkedin: "https://www.linkedin.com/company/dsgt/",
youtube: "https://www.youtube.com/channel/UC1DGL6Tb9ffwC-aHChadxMw",
instagram: "https://www.instagram.com/datasciencegt/",
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/features/Train/features/Tabular/components/TabularFlow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ interface OnChangeArgs {
interface LayerNodeData {
label:
| (typeof STEP_SETTINGS.PARAMETERS.layers)[ALL_LAYERS]["label"]
| "Start";
| "Beginning";
value: ALL_LAYERS | "root";
parameters?: number[];
onChange: (args: OnChangeArgs) => void;
Expand All @@ -282,7 +282,7 @@ const ROOT_NODE: Node<LayerNodeData> = {
position: { x: DEFAULT_X_POSITION, y: 0 },
deletable: false,
data: {
label: "Start",
label: "Beginning",
value: "root",
parameters: [],
onChange: () => undefined,
Expand Down
1 change: 1 addition & 0 deletions frontend/src/features/Train/features/Tabular/components/TabularParametersStep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ const TabularParametersStep = ({
/>
</>
)}

<FormControl>
<FormLabel>Problem Type</FormLabel>
<Controller
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/features/Train/features/Tabular/constants/tabularConstants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import TabularParametersStep from "../components/TabularParametersStep";
import TabularReviewStep from "../components/TabularReviewStep";
import TabularTrainspace from "../components/TabularTrainspace";


export const TRAINSPACE_SETTINGS = {
name: "Tabular",
steps: ["DATASET", "PARAMETERS", "REVIEW"],
Expand All @@ -29,6 +30,7 @@ export const STEP_SETTINGS = {
problemTypes: [
{ label: "Classification", value: "CLASSIFICATION" },
{ label: "Regression", value: "REGRESSION" },
{ label: "NOTHING", value: "NOTHING" },
],
criterions: [
{
Expand Down
1 change: 1 addition & 0 deletions frontend/src/pages/login.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ const Login = () => {
useEffect(() => {
if (router.isReady && isSignedIn(user)) {
router.replace({ pathname: "/dashboard" });
console.log(user.email);
}
}, [user, router.isReady]);
const Title = (
Expand Down
99 changes: 99 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@
},
"homepage": "https://github.com/DSGT-DLP/Deep-Learning-Playground#readme",
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^6.4.2",
"@fortawesome/free-brands-svg-icons": "^6.4.2",
"@fortawesome/react-fontawesome": "^0.2.0",
"mamba": "^0.0.2"
}
}
64 changes: 64 additions & 0 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,32 @@
# yarn lockfile v1


"@fortawesome/[email protected]":
version "6.4.2"
resolved "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.4.2.tgz"
integrity sha512-1DgP7f+XQIJbLFCTX1V2QnxVmpLdKdzzo2k8EmvDOePfchaIGQ9eCHj2up3/jNEbZuBqel5OxiaOJf37TWauRA==

"@fortawesome/fontawesome-svg-core@^6.4.2", "@fortawesome/fontawesome-svg-core@~1 || ~6":
version "6.4.2"
resolved "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.4.2.tgz"
integrity sha512-gjYDSKv3TrM2sLTOKBc5rH9ckje8Wrwgx1CxAPbN5N3Fm4prfi7NsJVWd1jklp7i5uSCVwhZS5qlhMXqLrpAIg==
dependencies:
"@fortawesome/fontawesome-common-types" "6.4.2"

"@fortawesome/free-brands-svg-icons@^6.4.2":
version "6.4.2"
resolved "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.4.2.tgz"
integrity sha512-LKOwJX0I7+mR/cvvf6qIiqcERbdnY+24zgpUSouySml+5w8B4BJOx8EhDR/FTKAu06W12fmUIcv6lzPSwYKGGg==
dependencies:
"@fortawesome/fontawesome-common-types" "6.4.2"

"@fortawesome/react-fontawesome@^0.2.0":
version "0.2.0"
resolved "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.0.tgz"
integrity sha512-uHg75Rb/XORTtVt7OS9WoK8uM276Ufi7gCzshVWkUJbHhh3svsUUeqXerrM96Wm7fRiDzfKRwSoahhMIkGAYHw==
dependencies:
prop-types "^15.8.1"

"charenc@>= 0.0.1":
version "0.0.2"
resolved "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz"
Expand All @@ -12,6 +38,18 @@
resolved "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz"
integrity sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==

"js-tokens@^3.0.0 || ^4.0.0":
version "4.0.0"
resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"
integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==

loose-envify@^1.1.0, loose-envify@^1.4.0:
version "1.4.0"
resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"
integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
dependencies:
js-tokens "^3.0.0 || ^4.0.0"

mamba@^0.0.2:
version "0.0.2"
resolved "https://registry.npmjs.org/mamba/-/mamba-0.0.2.tgz"
Expand All @@ -26,3 +64,29 @@ MD5@^1.2.1:
dependencies:
charenc ">= 0.0.1"
crypt ">= 0.0.1"

object-assign@^4.1.1:
version "4.1.1"
resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==

prop-types@^15.8.1:
version "15.8.1"
resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz"
integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
dependencies:
loose-envify "^1.4.0"
object-assign "^4.1.1"
react-is "^16.13.1"

react-is@^16.13.1:
version "16.13.1"
resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz"
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==

react@>=16.3:
version "18.2.0"
resolved "https://registry.npmjs.org/react/-/react-18.2.0.tgz"
integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==
dependencies:
loose-envify "^1.1.0"
Loading