Skip to content

Commit

Permalink
[BLACK]: Update to latest version
Browse files Browse the repository at this point in the history
  • Loading branch information
amadolid authored and ypkang committed Apr 23, 2024
1 parent 871bf53 commit 3dba074
Show file tree
Hide file tree
Showing 68 changed files with 133 additions and 58 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ repos:
- id: check-json
- id: trailing-whitespace
- repo: https://github.com/psf/black
rev: 22.3.0
rev: 24.3.0
hooks:
- id: black
# It is recommended to specify the latest version of Python
Expand Down
28 changes: 16 additions & 12 deletions jaseci_ai_kit/_inactive/bi_ner/datamodel/example.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,13 @@ def collate_examples(
"input_ids": pad_sequence(
all_input_ids, batch_first=True, padding_value=padding_token_id
).long(),
"labels": pad_images(
target_label_ids, padding_value=-100, padding_length=(pad_length, None)
)
if not no_target_label_ids
else None,
"labels": (
pad_images(
target_label_ids, padding_value=-100, padding_length=(pad_length, None)
)
if not no_target_label_ids
else None
),
}

if return_batch_examples:
Expand Down Expand Up @@ -236,13 +238,15 @@ def strided_split(
torch.tensor(
[-100] + offset[chunk_start:chunk_end, 1].tolist(), dtype=torch.long
).long(),
torch.tensor(
[[-100] * max_entity_length]
+ target_label_ids[chunk_start:chunk_end].tolist(),
dtype=torch.long,
).long()
if target_label_ids is not None
else None,
(
torch.tensor(
[[-100] * max_entity_length]
+ target_label_ids[chunk_start:chunk_end].tolist(),
dtype=torch.long,
).long()
if target_label_ids is not None
else None
),
)
yield ex
chunk_start += stride
12 changes: 7 additions & 5 deletions jaseci_ai_kit/_inactive/bi_ner/model/ph_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -372,11 +372,13 @@ def collate_examples(
"input_ids": pad_sequence(
all_input_ids, batch_first=True, padding_value=padding_token_id
).long(),
"labels": pad_images(
target_label_ids, padding_value=-100, padding_length=(pad_length, None)
)
if not no_target_label_ids
else None,
"labels": (
pad_images(
target_label_ids, padding_value=-100, padding_length=(pad_length, None)
)
if not no_target_label_ids
else None
),
}

if return_batch_examples:
Expand Down
1 change: 1 addition & 0 deletions jaseci_ai_kit/jac_misc/jac_misc/openai/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
Requires OpenAI API Key
"""

from jaseci.jsorc.live_actions import jaseci_action
from jaseci.utils.utils import logger
from openai import OpenAI
Expand Down
1 change: 1 addition & 0 deletions jaseci_ai_kit/jac_nlp/jac_nlp/bi_enc/poly_enc.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
This action is inactive and not maintained for produciton usage.
"""

import os
import torch
from typing import Dict, List, Union
Expand Down
1 change: 0 additions & 1 deletion jaseci_ai_kit/jac_vision/jac_vision/rftm/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,6 @@ def resnet152(**kwargs):


class ToTensor(object):

"""Convert a ``PIL.Image`` or ``numpy.ndarray`` to tensor.
Converts a PIL.Image or numpy.ndarray (H x W x C) in the range
[0, 255] to a torch.FloatTensor of shape (C x H x W) in the range [0.0, 1.0].
Expand Down
20 changes: 10 additions & 10 deletions jaseci_core/jaseci/cli_tools/book_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,11 +205,11 @@ def api_call_spec(self, cls):
auth_level = (
"public"
if j in Sm._public_api
else "user"
if j in Sm._private_api
else "admin"
if j in Sm._admin_api
else "cli_only"
else (
"user"
if j in Sm._private_api
else "admin" if j in Sm._admin_api else "cli_only"
)
)
break
if not found:
Expand Down Expand Up @@ -438,11 +438,11 @@ def api_call_spec(self, cls):
auth_level = (
"public"
if j in Sm._public_api
else "user"
if j in Sm._private_api
else "admin"
if j in Sm._admin_api
else "cli_only"
else (
"user"
if j in Sm._private_api
else "admin" if j in Sm._admin_api else "cli_only"
)
)
break
if not found:
Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/act_lib/date.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Built in actions for Jaseci"""

from datetime import datetime, timedelta
from jaseci.jsorc.live_actions import jaseci_action
from dateutil.relativedelta import relativedelta
Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/act_lib/file.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Built in actions for Jaseci"""

from jaseci.jsorc.live_actions import jaseci_action
import os
import json
Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/act_lib/file_handler.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Built in actions for Jaseci"""

import mimetypes
import magic
from os import path
Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/act_lib/internal.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Built in actions for Jaseci"""

from jaseci.jsorc.live_actions import jaseci_action
from jaseci.utils.utils import perf_test_start, perf_test_stop

Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/act_lib/jaseci.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Built in actions for Jaseci"""

from jaseci.jsorc.live_actions import jaseci_action
from jaseci.utils.utils import master_from_meta, copy_func
from jaseci.prim.super_master import SuperMaster
Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/act_lib/net.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
architype node and/or edges. Keep in mind that a \\lstinline{jac_set}
is simply a list that only contains such elements.
"""

from jaseci.jsorc.live_actions import jaseci_action
from jaseci.utils.utils import master_from_meta
from jaseci.jac.jac_set import JacSet
Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/act_lib/rand.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Built in actions for Jaseci"""

import random

# import faker
Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/act_lib/request.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Built in actions for Jaseci"""

import requests
from jaseci.jsorc.live_actions import jaseci_action

Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/act_lib/std.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Built in actions for Jaseci"""

from operator import itemgetter
from jaseci.utils.utils import app_logger, json_out
from datetime import datetime
Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/act_lib/stripe.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Built in actions for Jaseci"""

import stripe as s

from jaseci.jsorc.jsorc import JsOrc
Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/act_lib/task.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Built in actions for Jaseci"""

from jaseci.jsorc.jsorc import JsOrc
from jaseci.jsorc.live_actions import jaseci_action
from jaseci.extens.svc.task_svc import TaskService
Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/act_lib/url.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Built in actions for Jaseci"""

from jaseci.jsorc.live_actions import jaseci_action
from fastapi import HTTPException
import base64
Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/act_lib/vector.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Built in actions for Jaseci"""

import numpy as np
from operator import itemgetter
import pickle, base64
Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/act_lib/webtool.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Built in actions for Jaseci"""

import requests
from jaseci.jsorc.live_actions import jaseci_action
from bs4 import BeautifulSoup
Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/act_lib/zip.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Built in actions for Jaseci"""

from jaseci.jsorc.live_actions import jaseci_action
from jaseci.utils.utils import print_stack_to_log
from base64 import b64decode, b64encode
Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/api/actions_api.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Admin Global api functions as a mixin
"""

from jaseci.extens.api.interface import Interface
import jaseci.jsorc.live_actions as lact
import json
Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/api/alias_api.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Alias api as a mixin
"""

from jaseci.extens.api.interface import Interface


Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/api/architype_api.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Architype api functions as a mixin
"""

from jaseci.extens.api.interface import Interface
from jaseci.prim.architype import Architype
from jaseci.prim.sentinel import Sentinel
Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/api/global_api.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Admin Global api functions as a mixin
"""

from jaseci.extens.api.interface import Interface
from jaseci.prim.sentinel import Sentinel
import uuid
Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/api/graph_api.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Graph api functions as a mixin
"""

from jaseci.extens.api.interface import Interface
from jaseci.utils.id_list import IdList
from jaseci.prim.graph import Graph
Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/api/health_api.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Health APIs
"""

from jaseci.jsorc.jsorc import JsOrc
from jaseci.extens.api.interface import Interface

Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/api/interface.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
General master interface engine for client interfaces as mixin
"""

from inspect import signature, getdoc
from jaseci.utils.utils import logger, is_jsonable, is_true, exc_stack_as_str_list
from jaseci.prim.element import Element
Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/api/jac_api.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Jac tools api functions as a mixin
"""

from copy import deepcopy
import json
import os
Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/api/jsorc_api.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
JSORC APIs
"""

import json
from json import dumps
from time import time
Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/api/logger_api.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Logger api as a mixin
"""

import re
from jaseci.extens.api.interface import Interface
from jaseci.utils.log_utils import parse_logs
Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/api/master_api.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Master api as a mixin
"""

from jaseci.extens.api.interface import Interface
from jaseci.utils.id_list import IdList
import uuid
Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/api/object_api.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Object api as a mixin
"""

from jaseci.extens.api.interface import Interface
from jaseci.prim.element import Element

Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/api/prometheus_api.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Prometheus APIs
"""

from jaseci.extens.api.interface import Interface
from jaseci.jsorc.jsorc import JsOrc
from jaseci.extens.svc.prome_svc import PrometheusService
Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/api/queue_api.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Queue api functions as a mixin
"""

from jaseci.extens.api.interface import Interface
from jaseci.jsorc.jsorc import JsOrc
from jaseci.extens.svc.task_svc import TaskService
Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/api/sentinel_api.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Sentinel api functions as a mixin
"""

from jaseci.extens.api.interface import Interface
from jaseci.utils.id_list import IdList
from jaseci.prim.sentinel import Sentinel
Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/api/super_api.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Super (master) api as a mixin
"""

from jaseci.extens.api.interface import Interface
from jaseci.prim.master import Master

Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/api/user_api.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
User API
"""

from jaseci.extens.api.interface import Interface
from jaseci.jsorc.jsorc import JsOrc

Expand Down
1 change: 1 addition & 0 deletions jaseci_core/jaseci/extens/api/walker_api.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Walker api functions as a mixin
"""

from jaseci.extens.api.interface import Interface
from jaseci.prim.walker import Walker
from jaseci.prim.node import Node
Expand Down
9 changes: 6 additions & 3 deletions jaseci_core/jaseci/extens/api/webhook_api.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Webhook API
"""

from jaseci.extens.api.interface import Interface
from fastapi import HTTPException
from jaseci.jsorc.jsorc import JsOrc
Expand Down Expand Up @@ -55,9 +56,11 @@ def webhook(self, provider: str, _req_ctx: dict = {}):
)
sentinel = self._h.get_obj(
master_id,
self._h.get_glob("GLOB_SENTINEL")
if sentinel_id == "global"
else sentinel_id,
(
self._h.get_glob("GLOB_SENTINEL")
if sentinel_id == "global"
else sentinel_id
),
)

payload = {"event": req_body}
Expand Down
6 changes: 3 additions & 3 deletions jaseci_core/jaseci/extens/svc/elastic_svc.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ def run(self):
"elastic",
metadata.get("namespace"),
)
self.config[
"auth"
] = f'basic {b64encode(f"elastic:{auth}".encode()).decode()}'
self.config["auth"] = (
f'basic {b64encode(f"elastic:{auth}".encode()).decode()}'
)

self.app = Elastic(self.config)
self.app.health("timeout=1s")
Expand Down

0 comments on commit 3dba074

Please sign in to comment.