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

State machines behaviour trees #5

Merged
merged 51 commits into from
Jul 3, 2024
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
c5279cc
Behaviour tree and State machine implementation
jp-droid Jun 28, 2024
49521d1
tests
zaid3727 Jun 29, 2024
4f127d3
--
zaid3727 Jul 2, 2024
2b38013
ci.yml update
zaid3727 Jul 2, 2024
3fdf866
-
zaid3727 Jul 2, 2024
aa2d475
pp
zaid3727 Jul 2, 2024
9098736
update ci.yml
zaid3727 Jul 2, 2024
0d096be
Commented exception KeyError
jp-droid Jul 2, 2024
72f05a3
Merge branch 'State_machines_behaviour_trees' of https://github.com/z…
jp-droid Jul 2, 2024
df69fa8
-
zaid3727 Jul 2, 2024
4e97b39
Merge branch 'State_machines_behaviour_trees' of https://github.com/z…
zaid3727 Jul 2, 2024
5b89b55
Update ci.yml
zaid3727 Jul 2, 2024
c9d203c
Update README.md
zaid3727 Jul 2, 2024
1582138
Update README.md
zaid3727 Jul 2, 2024
573e822
Update ci.yml
zaid3727 Jul 2, 2024
7edd83c
Update requirements.txt
zaid3727 Jul 2, 2024
3452780
Update ci.yml
zaid3727 Jul 2, 2024
7e6507d
Update ci.yml
zaid3727 Jul 2, 2024
6f94025
Update ci.yml
zaid3727 Jul 2, 2024
a80b342
Update ci.yml
zaid3727 Jul 2, 2024
3b3e87d
Commented Keyerror throw
zaid3727 Jul 2, 2024
c771f6f
Merge branch 'State_machines_behaviour_trees' of https://github.com/z…
zaid3727 Jul 2, 2024
9e6c42c
PEP8 required changes
zaid3727 Jul 2, 2024
121eb9b
Remaining PEP8standard required changes
zaid3727 Jul 2, 2024
bd47c3b
minor changes
zaid3727 Jul 2, 2024
0e502f8
minor changes PEP8 standards
zaid3727 Jul 2, 2024
df34a48
yaml changes
zaid3727 Jul 2, 2024
eac1e1c
requirementchanges
zaid3727 Jul 2, 2024
2419c23
codacy-analysis
zaid3727 Jul 2, 2024
a07abce
trial
zaid3727 Jul 2, 2024
b29c8cd
changes
zaid3727 Jul 2, 2024
6581f4a
try
zaid3727 Jul 2, 2024
d0e41f5
python version change
zaid3727 Jul 2, 2024
d978174
rclpy changes trial
zaid3727 Jul 2, 2024
611171d
yaml changes
zaid3727 Jul 2, 2024
5ce1378
changes
zaid3727 Jul 2, 2024
65c6d94
trial
zaid3727 Jul 2, 2024
a36ab8c
humble yaml changes
zaid3727 Jul 2, 2024
1bc34f0
other changes
zaid3727 Jul 2, 2024
fb00004
trial
zaid3727 Jul 2, 2024
183458e
std_msgs and geom msgs resolved
zaid3727 Jul 2, 2024
6d3741f
smach changes
zaid3727 Jul 2, 2024
f24338a
run change
zaid3727 Jul 2, 2024
d744751
debug
zaid3727 Jul 2, 2024
6f72ce5
commit_pip
zaid3727 Jul 2, 2024
30ee6cf
analysis-coverage
zaid3727 Jul 2, 2024
697108b
codacy_changes
zaid3727 Jul 2, 2024
01b54d5
humble changes
zaid3727 Jul 2, 2024
bc2690b
changes
zaid3727 Jul 2, 2024
fec619d
rclpy
zaid3727 Jul 2, 2024
eb8b35c
final changes
zaid3727 Jul 2, 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
13 changes: 13 additions & 0 deletions .codacy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
engines:
pylint:
enabled: true
flake8:
enabled: true
config: .flake8

patterns:
pylint:
- pylint
flake8:
- flake8

49 changes: 49 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: CI

on: [push, pull_request]

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Set up Python 3.10
uses: actions/setup-python@v2
with:
python-version: 3.10

- name: Set up ROS 2 Humble
run: |
sudo apt update
sudo apt install -y curl gnupg2 lsb-release
sudo curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | sudo apt-key add -
sudo sh -c 'echo "deb http://packages.ros.org/ros2/ubuntu $(lsb_release -cs) main" > /etc/apt/sources.list.d/ros2-latest.list'
sudo apt update
sudo apt install -y ros-humble-desktop
echo "source /opt/ros/humble/setup.bash" >> ~/.bashrc
source ~/.bashrc

- name: Install ROS 2 dependencies
run: |
source /opt/ros/humble/setup.bash
sudo apt install -y ros-humble-executive-smach ros-humble-rclpy ros-humble-geometry-msgs ros-humble-std-msgs ros-humble-sensor-msgs

- name: Install Python dependencies
run: |
source /opt/ros/humble/setup.bash
python3 -m venv venv
source venv/bin/activate
python -m pip install --upgrade pip
pip install -r requirements.txt
pip install pyyaml # Install pyyaml to handle YAML files
pip install lark-parser # Install lark module for parsing
pip install numpy # Install numpy for scientific computing

- name: Run tests
run: |
source /opt/ros/humble/setup.bash
source venv/bin/activate
pytest tests/
33 changes: 33 additions & 0 deletions .github/workflows/codacy-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Codacy Analysis

on: [pull_request]

jobs:
codacy-analysis:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: 3.10

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt

- name: Run tests and coverage
run: |
pip install codacy-coverage
coverage run -m pytest
coverage xml -o coverage.xml

- name: Upload coverage to Codacy
run: |
python-codacy-coverage -r coverage.xml
env:
CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
25 changes: 23 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,23 @@
# ast_ss24
repository for Advanced Software technologies, for summer semester 2024, HBRS
# AST_SS24

[![Codacy Badge](https://app.codacy.com/project/badge/Grade/456677987e644642b1ceac03558b15ee)](https://app.codacy.com?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
[![CI](https://github.com/zaid3727/ast_ss24/actions/workflows/ci.yml/badge.svg)](https://github.com/zaid3727/ast_ss24/actions/workflows/ci.yml)

## Overview

AST_SS24 is a project designed to implement and test behavior trees and state machines in ROS 2 using Python. This repository includes unit tests to ensure the functionality and correctness of the implementation.

## Table of Contents

- [Setup](#setup)
- [Continuous Integration](#continuous-integration)
- [Code Quality](#code-quality)
- [Running Tests](#running-tests)

## Setup

1. **Clone the Repository:**

```sh
git clone https://github.com/zaid3727/ast_ss24.git
cd ast_ss24
1 change: 1 addition & 0 deletions Robile
Submodule Robile added at 180fe6
1 change: 1 addition & 0 deletions executive_smach
Submodule executive_smach added at f14c51
1 change: 1 addition & 0 deletions kelo_tulip
Submodule kelo_tulip added at 319c51
1 change: 1 addition & 0 deletions py_trees_ros
Submodule py_trees_ros added at 247cf4
9 changes: 9 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
pytest
py_trees
py_trees_ros (Commented out if not available)
rclpy
geometry_msgs
std_msgs
sensor_msgs
smach

1 change: 1 addition & 0 deletions robile_description
Submodule robile_description added at c776e0
1 change: 1 addition & 0 deletions robile_gazebo
Submodule robile_gazebo added at 4428c1
1 change: 1 addition & 0 deletions robile_interfaces
Submodule robile_interfaces added at 89823d
1 change: 1 addition & 0 deletions robile_navigation
Submodule robile_navigation added at 8a88f5
202 changes: 202 additions & 0 deletions safety_robile/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
18 changes: 18 additions & 0 deletions safety_robile/package.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>safety_robile</name>
<version>0.0.0</version>
<description>TODO: Package description</description>
<maintainer email="[email protected]">jay</maintainer>
<license>Apache-2.0</license>

<test_depend>ament_copyright</test_depend>
<test_depend>ament_flake8</test_depend>
<test_depend>ament_pep257</test_depend>
<test_depend>python3-pytest</test_depend>

<export>
<build_type>ament_python</build_type>
</export>
</package>
Empty file.
Empty file.
Loading
Loading