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

Rename to aixd_ara #33

Merged
merged 1 commit into from
May 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ tag = True
search = version="{current_version}"
replace = version="{new_version}"

[bumpversion:file:src/aixd_grasshopper/__init__.py]
[bumpversion:file:src/aixd_ara/__init__.py]
search = __version__ = "{current_version}"
replace = __version__ = "{new_version}"

[bumpversion:file:CHANGELOG.md]
search = Unreleased
replace = [{new_version}] {now:%Y-%m-%d}
replace = [{new_version}] {now:%Y-%m-%d}
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ ENV/
.mypy_cache/

# ==============================================================================
# aixd_grasshopper
# aixd_ara
# ==============================================================================

*.3dmbak
Expand All @@ -116,6 +116,6 @@ temp/**
.vscode

docs/api/generated/
src/aixd_grasshopper/components/ghuser/
src/aixd_ara/components/ghuser/

conda.recipe/
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Contributions are welcome and very much appreciated!
We accept code contributions through pull requests.
In short, this is how that works.

1. Fork [the repository](https://github.com/gramaziokohler/aixd_grasshopper) and clone the fork.
1. Fork [the repository](https://github.com/gramaziokohler/aixd_ara) and clone the fork.
2. Create a virtual environment using your tool of choice (e.g. `virtualenv`, `conda`, etc).
3. Install development dependencies:

Expand Down Expand Up @@ -44,15 +44,15 @@ command line to ease recurring operations:

## Bug reports

When [reporting a bug](https://github.com/gramaziokohler/aixd_grasshopper/issues) please include:
When [reporting a bug](https://github.com/gramaziokohler/aixd_ara/issues) please include:

* Operating system name and version.
* Any details about your local setup that might be helpful in troubleshooting.
* Detailed steps to reproduce the bug.

## Feature requests

When [proposing a new feature](https://github.com/gramaziokohler/aixd_grasshopper/issues) please include:
When [proposing a new feature](https://github.com/gramaziokohler/aixd_ara/issues) please include:

* Explain in detail how it would work.
* Keep the scope as narrow as possible, to make it easier to implement.
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,34 +11,34 @@ Grasshopper plugin for the AIXD toolkit.
- flask

#### Latest stable version
Install `aixd_grasshopper` using `pip`
Install `aixd_ara` using `pip`
```
pip install aixd_grasshopper
pip install aixd_ara
```

Install `aixd_grasshopper` using `conda`:
Install `aixd_ara` using `conda`:
```
conda install -c conda-forge aixd_grasshopper
conda install -c conda-forge aixd_ara
```

**Note**: It is recommended to use virtual environments to manage the dependencies of your projects. If you are using
`conda`, you can create a new environment with `conda create -n myproject python=3.9` and then activate it with
`conda activate myproject` before installing `aixd_grasshopper`.
`conda activate myproject` before installing `aixd_ara`.

#### Latest unstable version

Install the latest version using `pip` from the git repository:
```
pip install --upgrade git+https://github.com/gramaziokohler/aixd_grasshopper.git
pip install --upgrade git+https://github.com/gramaziokohler/aixd_ara.git
```

## Development

If you are going to develop on this repository, perform an installation from source:

```bash
git clone https://github.com/gramaziokohler/aixd_grasshopper.git
cd aixd_grasshopper
git clone https://github.com/gramaziokohler/aixd_ara.git
cd aixd_ara
```

Then, install using conda, to install all the dependencies into a new environment called `aixd_gh`:
Expand Down Expand Up @@ -67,7 +67,7 @@ Check the [contribution guidelines](CONTRIBUTING.md) for more details.
The structure we follow on the current repo is as follows:

* `src` : for all source code.
* `src/aixd_grasshopper` : source code of `aixd_grasshopper` plugin.
* `src/aixd_grasshopper/components` : source code of the GH components.
* `src/aixd_grasshopper/ghuser_manual` : binary components, pre-built.
* `src/aixd_ara` : source code of `aixd_ara` plugin.
* `src/aixd_ara/components` : source code of the GH components.
* `src/aixd_ara/ghuser_manual` : binary components, pre-built.
* `src/compas_aixd` : source code of the connector to COMPAS infrastructure.
6 changes: 3 additions & 3 deletions conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import numpy
import pytest

import aixd_grasshopper
import aixd_ara


def pytest_ignore_collect(path):
Expand All @@ -24,8 +24,8 @@ def add_compas(doctest_namespace):


@pytest.fixture(autouse=True)
def add_aixd_grasshopper(doctest_namespace):
doctest_namespace["aixd_grasshopper"] = aixd_grasshopper
def add_aixd_ara(doctest_namespace):
doctest_namespace["aixd_ara"] = aixd_ara


@pytest.fixture(autouse=True)
Expand Down
4 changes: 2 additions & 2 deletions docs/_static/versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
{
"name": "latest",
"version": "unreleased",
"url": "https://gramaziokohler.github.io/aixd_grasshopper/latest/"
"url": "https://gramaziokohler.github.io/aixd_ara/latest/"
}
]
]
4 changes: 2 additions & 2 deletions docs/authors.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Authors

**ARA** is developed by Aleksandra Anna Apolinarska, together with Gonzalo Casas at
`ETH Zurich <https://ethz.ch/>`_
(`Gramazio Kohler Research <https://gramaziokohler.arch.ethz.ch/>`_,
(`Gramazio Kohler Research <https://gramaziokohler.arch.ethz.ch/>`_,
and Luis Salamanca at
`Swiss Data Science Center <https://www.datascience.ch/>`_.

Expand All @@ -22,5 +22,5 @@ If you use **ARA** in your work, please cite it as:
author = {Apolinarska, Aleksandra Anna and Casas, Gonzalo and Salamanca, Luis},
year = {2024},
publisher = {GitHub},
howpublished = {\url{https://github.com/gramaziokohler/aixd_grasshopper}},
howpublished = {\url{https://github.com/gramaziokohler/aixd_ara}},
}
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
project = "ARA"
copyright = "Copyright (c) 2023-2024 ETH Zurich, Gramazio Kohler Research"
author = "Aleksandra Apolinarska"
package = "aixd_grasshopper"
package = "aixd_ara"
organization = "gramaziokohler"

master_doc = "index"
Expand Down
4 changes: 2 additions & 2 deletions docs/examples.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ Examples

Here you can find examples showinf the basic workflow using **ARA** in Grasshopper.

- Bridge shell: `see here <https://github.com/gramaziokohler/aixd_grasshopper/tree/main/examples/bridge_shell>`__
- Urban massing: `see here <https://github.com/gramaziokohler/aixd_grasshopper/tree/main/examples/urban_massing>`__
- Bridge shell: `see here <https://github.com/gramaziokohler/aixd_ara/tree/main/examples/bridge_shell>`__
- Urban massing: `see here <https://github.com/gramaziokohler/aixd_ara/tree/main/examples/urban_massing>`__
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.black]
line-length = 120
extend-exclude = "src/aixd_grasshopper/components"
extend-exclude = "src/aixd_ara/components"

[tool.pytest.ini_options]
minversion = "6.0"
Expand All @@ -21,8 +21,8 @@ force_grid_wrap = 0
use_parentheses = true
force_single_line = true
ensure_newline_before_comments = true
known_first_party = "aixd_grasshopper"
known_first_party = "aixd_ara"
default_section = "THIRDPARTY"
forced_separate = "test_aixd_grasshopper"
forced_separate = "test_aixd_ara"
skip = ["__init__.py"]

2 changes: 1 addition & 1 deletion scripts/generate_rst_docs_from_components.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"\n",
"current_dir = os.getcwd()\n",
"parent_dir = os.path.dirname(current_dir)\n",
"GHCOMP_FOLDER = os.path.join(parent_dir, \"src\",\"aixd_grasshopper\",\"components\")\n",
"GHCOMP_FOLDER = os.path.join(parent_dir, \"src\",\"aixd_ara\",\"components\")\n",
"OUTPUT_PATH = os.path.join(parent_dir, \"docs\")\n"
]
},
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ def read(*names, **kwargs):
requirements = read("requirements.txt").split("\n")

setup(
name="aixd_grasshopper",
name="aixd_ara",
version="0.1.0",
description="Grasshopper plugin for the AIXD toolkit",
long_description=long_description,
long_description_content_type="text/markdown",
url="https://github.com/gramaziokohler/aixd_grasshopper",
url="https://github.com/gramaziokohler/aixd_ara",
author="Aleksandra Apolinarska",
author_email="[email protected]",
license="MIT license",
Expand All @@ -48,7 +48,7 @@ def read(*names, **kwargs):
],
keywords=[],
project_urls={},
packages=["aixd_grasshopper", "compas_aixd"],
packages=["aixd_ara", "compas_aixd"],
package_dir={"": "src"},
package_data={},
data_files=[],
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions src/aixd_grasshopper/api.py → src/aixd_ara/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
from flask import Flask
from flask import request

from aixd_grasshopper.constants import DEFAULT_PORT
from aixd_grasshopper.controller import SessionController
from aixd_ara.constants import DEFAULT_PORT
from aixd_ara.controller import SessionController

app = Flask(__name__)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# flake8: noqa
from aixd_grasshopper.wrappers import WrapperShallowDataObject
from aixd_ara.wrappers import WrapperShallowDataObject

if not dim or dim < 1:
dim = 1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# flake8: noqa
from aixd_grasshopper.wrappers import WrapperShallowDataObject
from aixd_ara.wrappers import WrapperShallowDataObject

if not dim or dim < 1:
dim = 1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# flake8: noqa
from aixd_grasshopper.wrappers import WrapperShallowDataObject
from aixd_ara.wrappers import WrapperShallowDataObject

if not dim or dim < 1:
dim = 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import Grasshopper
import System.Drawing as sd

from aixd_grasshopper.gh_ui import get_dataobject_names_from_block
from aixd_grasshopper.gh_ui_helper import session_id
from aixd_ara.gh_ui import get_dataobject_names_from_block
from aixd_ara.gh_ui_helper import session_id

comp = ghenv.Component
ghdoc = comp.OnPingDocument()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# flake8: noqa
from aixd_grasshopper.wrappers import WrapperShallowDataObject
from aixd_ara.wrappers import WrapperShallowDataObject

if not dim or dim < 1:
dim = 1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# flake8: noqa
from scriptcontext import sticky as st

from aixd_grasshopper.gh_ui import create_dataset_object
from aixd_grasshopper.gh_ui_helper import component_id
from aixd_grasshopper.gh_ui_helper import session_id
from aixd_ara.gh_ui import create_dataset_object
from aixd_ara.gh_ui_helper import component_id
from aixd_ara.gh_ui_helper import session_id

cid = component_id(session_id(), ghenv.Component, "DatasetCreate")

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from aixd_grasshopper.scripts import dataset_generator
from aixd_ara.scripts import dataset_generator

path = dataset_generator.__file__

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# flake8: noqa
from scriptcontext import sticky as st

from aixd_grasshopper.gh_ui import load_dataset
from aixd_grasshopper.gh_ui_helper import component_id
from aixd_grasshopper.gh_ui_helper import session_id
from aixd_ara.gh_ui import load_dataset
from aixd_ara.gh_ui_helper import component_id
from aixd_ara.gh_ui_helper import session_id

cid = component_id(session_id(), ghenv.Component, "DatasetLoad")

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# flake8: noqa
from scriptcontext import sticky as st

from aixd_grasshopper.gh_ui import get_one_sample
from aixd_grasshopper.gh_ui_helper import component_id
from aixd_grasshopper.gh_ui_helper import instantiate_sample, sample_summary
from aixd_grasshopper.gh_ui_helper import session_id
from aixd_ara.gh_ui import get_one_sample
from aixd_ara.gh_ui_helper import component_id
from aixd_ara.gh_ui_helper import instantiate_sample, sample_summary
from aixd_ara.gh_ui_helper import session_id

cid = component_id(session_id(), ghenv.Component, "GetOneSample")

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# flake8: noqa
from scriptcontext import sticky as st

from aixd_grasshopper.gh_ui import dataset_summary
from aixd_grasshopper.gh_ui_helper import component_id
from aixd_grasshopper.gh_ui_helper import session_id
from aixd_ara.gh_ui import dataset_summary
from aixd_ara.gh_ui_helper import component_id
from aixd_ara.gh_ui_helper import session_id

cid = component_id(session_id(), ghenv.Component, "DatasetSummary")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@

from scriptcontext import sticky as st

from aixd_grasshopper.gh_ui import get_dataobject_types
from aixd_grasshopper.gh_ui import request_designs
from aixd_grasshopper.gh_ui_helper import component_id
from aixd_grasshopper.gh_ui_helper import instantiate_sample
from aixd_grasshopper.gh_ui_helper import sample_summary as sample_summary_f
from aixd_grasshopper.gh_ui_helper import session_id
from aixd_grasshopper.gh_ui_helper import reformat_request
from aixd_ara.gh_ui import get_dataobject_types
from aixd_ara.gh_ui import request_designs
from aixd_ara.gh_ui_helper import component_id
from aixd_ara.gh_ui_helper import instantiate_sample
from aixd_ara.gh_ui_helper import sample_summary as sample_summary_f
from aixd_ara.gh_ui_helper import session_id
from aixd_ara.gh_ui_helper import reformat_request

cid = component_id(session_id(), ghenv.Component, "run_generation")
item = component_id(session_id(), ghenv.Component, "pick_sample")

"""
requested_values: a multiline string with variable_name:values tuples.
requested_values: a multiline string with variable_name:values tuples.
"""

if not n_designs or n_designs < 1:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# flake8: noqa
from scriptcontext import sticky as st

from aixd_grasshopper.gh_ui import model_input_output_dimensions
from aixd_grasshopper.gh_ui_helper import component_id
from aixd_grasshopper.gh_ui_helper import session_id
from aixd_ara.gh_ui import model_input_output_dimensions
from aixd_ara.gh_ui_helper import component_id
from aixd_ara.gh_ui_helper import session_id

cid = component_id(session_id(), ghenv.Component, "ModelDims")

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# flake8: noqa
from scriptcontext import sticky as st

from aixd_grasshopper.gh_ui import model_load
from aixd_grasshopper.gh_ui_helper import component_id
from aixd_grasshopper.gh_ui_helper import session_id
from aixd_ara.gh_ui import model_load
from aixd_ara.gh_ui_helper import component_id
from aixd_ara.gh_ui_helper import session_id

cid = component_id(session_id(), ghenv.Component, "ModelLoad")

Expand Down
Loading
Loading